Fix merge

Author: GREdens

package.json

@@ -3,11 +3,7 @@
     "title": "Widget Development Plugin for Adobe Brackets",
     "description": "This extension turns Adobe Brackets into an IDE for creating Custom Widgets for the Mendix platform.",
     "homepage": "https://github.com/mendix/WDPForBrackets",
-<<<<<<< HEAD
-    "version": "1.0.1",
-=======
     "version": "1.0.2",
->>>>>>> Changes to the WDPForBrackets
     "author": "Gerhard Richard Edens",
     "license": "Apache 2",
     "engines": {