chore(release): v5.4.0

RAMP-PCAR · Jun 5, 2015 · b95cb38 · b95cb38
1 parent 75d83fd
commit b95cb38
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,13 +1,8 @@
 {
     "name": "ramp-theme-usability",
     "subname": "Reusable Accessible Mapping Platform - Usability Theme",
-<<<<<<< Updated upstream
-    "version": "5.4.0",
-    "description": "RAMP GIS viewer - Elk; Sample of an implementation of RAMP with Usability Theme",
-=======
     "version": "5.4.0",
     "description": "RAMP GIS viewer - Groundhog; Sample of an implementation of RAMP with Usability Theme",
->>>>>>> Stashed changes
     "main": "index.js",
     "url": "http://tfs.int.ec.gc.ca:8080/tfs/dc/_git/RAMP",
     "scripts": {