Merged in umd support

neilff · Apr 29, 2017 · e690f66 · e690f66
2 parents ea8f31e + 67da7e0
commit e690f66
Show file tree

Hide file tree

Showing 4 changed files with 1,154 additions and 520 deletions.
diff --git a/example/package.json b/example/package.json
@@ -21,7 +21,11 @@
   "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",