Skip to content

Commit e690f66

Browse files
committed
Merged in umd support
2 parents ea8f31e + 67da7e0 commit e690f66

File tree

4 files changed

+1154
-520
lines changed

4 files changed

+1154
-520
lines changed

example/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
"license": "MIT",
2222
"dependencies": {
2323
"angular": "^1.5.1",
24+
<<<<<<< HEAD
2425
"angular-ui-router": "^1.0.0-rc.1",
26+
=======
27+
"angular-ui-router": "0.4.2",
28+
>>>>>>> master
2529
"ng-redux": "^3.3.3",
2630
"react-redux": "^4.4.5",
2731
"redux-devtools": "^3.3.1",

0 commit comments

Comments
 (0)