Merge pull request #114 from chughts/master

Corrected package.json

Author: chughts

package.json

@@ -41,14 +41,9 @@
       "watson-text-to-speech-v1": "services/text_to_speech/v1.js",
       "watson-tradeoff-analytics-v1": "services/tradeoff_analytics/v1.js",
       "watson-tone-analyzer-v3-beta": "services/tone_analyzer/v3-beta.js",
-<<<<<<< HEAD
       "watson-tone-analyzer-v3": "services/tone_analyzer/v3.js",
-      "watson-visual-recognition-v1": "services/visual_recognition/v1.js"
-=======
       "watson-visual-recognition-v1": "services/visual_recognition/v1.js",
-      "watson-visual-recognition-v3": "services/visual_recognition/v3.js",
-      "watson-tone-analyzer-v3": "services/tone_analyzer/v3.js"
->>>>>>> cb36248baf265b915b16f27f5ecfe4ea5cf59203
+      "watson-visual-recognition-v3": "services/visual_recognition/v3.js"
     }
   }
 }