You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/07/05 02:24:45 UTC
incubator-griffin git commit: 20170705 update gitignore
Repository: incubator-griffin
Updated Branches:
refs/heads/master 4eee878ec -> ede1914fb
20170705 update gitignore
Author: William Guo <gu...@icloud.com>
Closes #101 from guoyuepeng/20170705_update_gitignore.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/ede1914f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/ede1914f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/ede1914f
Branch: refs/heads/master
Commit: ede1914fb6a465f60b7d8f046ac9afe6520290cb
Parents: 4eee878
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 10:24:32 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 10:24:32 2017 +0800
----------------------------------------------------------------------
.gitignore | 1 -
ui/bower.json | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ede1914f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9ba7afc..1ba27fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ target/**
*.ear
target
service/src/main/resources/public/
-service/src/main/resources/application-dev.properties
.project
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ede1914f/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"
}
}