FIX Package.json

telefonicaid · May 21, 2015 · c86719e · c86719e
1 parent fe7a464
commit c86719e
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,13 +1,8 @@
 {
   "name": "fiware-pep-steelskin",
   "description": "FiWare Policy Enforcement Point",
-<<<<<<< HEAD
-  "version": "0.6.0",
-  "homepage": "https://github.com/telefonicaid/fiware-orion-pep",
-=======
-  "version": "0.7.0-next",
+  "version": "0.7.0",
   "homepage": "https://github.com/telefonicaid/fiware-pep-steelskin",
->>>>>>> develop
   "author": {
     "name": "Daniel Moran",
     "email": "[email protected]"