fix package.json

brigand · brigand · commit de8253e9c8ca · 2014-06-24T22:22:12.000-07:00
diff --git a/package.json b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "react-nested-router",
-  "version": "0.2.1",
->>>>>>> up/master
+  "version": "0.2.0",
   "description": "A complete routing library for React",
   "tags": [
     "react",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-nested-router",`
`3`		`- "version": "0.2.1",`
`4`		`->>>>>>> up/master`
	`3`	`+ "version": "0.2.0",`
`5`	`4`	`"description": "A complete routing library for React",`
`6`	`5`	`"tags": [`
`7`	`6`	`"react",`