package.json became corrupted - now corrected

chughts · chughts · commit 9b0cb0d0d9d6 · 2016-06-04T13:00:23.000+01:00
diff --git a/package.json b/package.json
@@ -41,14 +41,11 @@
       "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
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,11 @@`
`41`	`41`	`"watson-text-to-speech-v1": "services/text_to_speech/v1.js",`
`42`	`42`	`"watson-tradeoff-analytics-v1": "services/tradeoff_analytics/v1.js",`
`43`	`43`	`"watson-tone-analyzer-v3-beta": "services/tone_analyzer/v3-beta.js",`
`44`		`-<<<<<<< HEAD`
`45`	`44`	`"watson-tone-analyzer-v3": "services/tone_analyzer/v3.js",`
`46`	`45`	`"watson-visual-recognition-v1": "services/visual_recognition/v1.js"`
`47`		`-=======`
`48`	`46`	`"watson-visual-recognition-v1": "services/visual_recognition/v1.js",`
`49`	`47`	`"watson-visual-recognition-v3": "services/visual_recognition/v3.js",`
`50`	`48`	`"watson-tone-analyzer-v3": "services/tone_analyzer/v3.js"`
`51`		`->>>>>>> cb36248baf265b915b16f27f5ecfe4ea5cf59203`
`52`	`49`	`}`
`53`	`50`	`}`
`54`	`51`	`}`