bower angular conflict resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/c267949d Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/c267949d Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/c267949d Branch: refs/heads/master Commit: c267949da23d0f3f6ebfff179a2feb1c5153ed59 Parents: 7722d2d Author: William Guo <[email protected]> Authored: Wed Jul 5 10:13:38 2017 +0800 Committer: William Guo <[email protected]> Committed: Wed Jul 5 10:13:38 2017 +0800 ---------------------------------------------------------------------- ui/bower.json | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/c267949d/ui/bower.json ---------------------------------------------------------------------- diff --git a/ui/bower.json b/ui/bower.json index 5677280..6f6ff2e 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -15,5 +15,8 @@ "domReady": "2.0.1", "angular-spinner": "0.8.0", "echarts": "3.2.2" + }, + "resolutions": { + "angular": "1.6.4" } }
