fix(build): merge commit did not remove merge markers

RAMP-PCAR · Mar 13, 2015 · 2b854d7 · 2b854d7
1 parent 3cc9981
commit 2b854d7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,10 +1,6 @@
 {
     "name": "ramp-pcar",
-<<<<<<< HEAD
     "version": "5.2.0-0",
-=======
-    "version": "5.1.0-5",
->>>>>>> 472db43f6d52ae269f95779e75863a2ad1084237
     "homepage": "http://ramp-pcar.github.io",
     "authors": [
         "BeSD - SA Team"

diff --git a/package.json b/package.json
@@ -1,11 +1,7 @@
 {
     "name": "ramp-pcar",
     "subname": "Reusable Accessible Mapping Platform",
-<<<<<<< HEAD
     "version": "5.2.0-0",
-=======
-    "version": "5.1.0-5",
->>>>>>> 472db43f6d52ae269f95779e75863a2ad1084237
     "description": "RAMP GIS viewer - Elk; Sample of an implementation of RAMP",
     "main": "",
     "repository": {

diff --git a/yuidoc.json b/yuidoc.json
@@ -1,11 +1,7 @@
 {
     "name": "ramp-pcar",
     "subname": "Reusable Accessible Mapping Platform",
-<<<<<<< HEAD
     "version": "5.2.0-0",
-=======
-    "version": "5.1.0-5",
->>>>>>> 472db43f6d52ae269f95779e75863a2ad1084237
     "description": "RAMP GIS viewer - Elk; Sample of an implementation of RAMP",
     "linkNatives": "true",
     "options": {