Resolve conflicts

ScottLogic · Mar 21, 2016 · 89a53a5 · 89a53a5
2 parents 004131e + 4b56ac5
commit 89a53a5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bitflux-openfin",
   "version": "10.0.0",
-  "type": "develop",
+  "type": "master",
   "scripts": {
     "test": "grunt ci",
     "postinstall": "cd node_modules/BitFlux && npm i"