Fix merge conflict.

jpellikk-arm · jpellikk-arm · commit 5d6321327a13 · 2016-03-02T14:33:16.000+02:00
diff --git a/module.json b/module.json
@@ -1,6 +1,6 @@
 {
   "name": "nanostack-border-router",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "description": "Nanostack Border Router",
   "keywords": [
     "Nanostack",
@@ -10,7 +10,7 @@
   "homepage": "https://github.com/ARMmbed/nanostack-border-router",
   "license": "Apache-2.0",
   "dependencies": {
-      "sal-stack-nanostack": "^4.0.0",
-	    "atmel-rf-driver": "^2.0.0"
+    "sal-stack-nanostack": "^4.0.2",
+    "atmel-rf-driver": "^2.0.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nanostack-border-router",`
`3`		`- "version": "0.0.1",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"description": "Nanostack Border Router",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"Nanostack",`
`@@ -10,7 +10,7 @@`
`10`	`10`	`"homepage": "https://github.com/ARMmbed/nanostack-border-router",`
`11`	`11`	`"license": "Apache-2.0",`
`12`	`12`	`"dependencies": {`
`13`		`- "sal-stack-nanostack": "^4.0.0",`
`14`		`- "atmel-rf-driver": "^2.0.0"`
	`13`	`+ "sal-stack-nanostack": "^4.0.2",`
	`14`	`+ "atmel-rf-driver": "^2.0.0"`
`15`	`15`	`}`
`16`	`16`	`}`