bower: nette.ajax.js - fixed conflict

Venne · Oct 6, 2014 · 0c219be · 0c219be
1 parent 28870a6
commit 0c219be
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -13,7 +13,10 @@
 		"select2": "~3.4.5",
 		"typeahead.js": "~0.10.2",
 		"holderjs": "~2.3.2",
-		"nette.ajax.js": "#master",
-		"history.nette.ajax.js": "#master"
+		"nette.ajax.js": "master",
+		"history.nette.ajax.js": "master"
+	},
+	"resolutions": {
+		"nette.ajax.js": "master"
 	}
 }