Fixed up example

neilff · Apr 29, 2017 · d63c54e · d63c54e
1 parent e690f66
commit d63c54e
Show file tree

Hide file tree

Showing 2 changed files with 366 additions and 524 deletions.
diff --git a/example/package.json b/example/package.json
@@ -21,11 +21,7 @@
   "license": "MIT",
   "dependencies": {
     "angular": "^1.5.1",
-<<<<<<< HEAD
     "angular-ui-router": "^1.0.0-rc.1",
-=======
-    "angular-ui-router": "0.4.2",
->>>>>>> master
     "ng-redux": "^3.3.3",
     "react-redux": "^4.4.5",
     "redux-devtools": "^3.3.1",