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/10/30 06:34:14 UTC
incubator-griffin git commit: 20171030 merge conflict fix
Repository: incubator-griffin
Updated Branches:
refs/heads/master ed063d920 -> edac09af1
20171030 merge conflict fix
Author: William Guo <gu...@icloud.com>
Closes #150 from guoyuepeng/20171030_merge_conflict_fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/edac09af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/edac09af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/edac09af
Branch: refs/heads/master
Commit: edac09af13f1663d5df95d4c56c27436fe1f938d
Parents: ed063d9
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 14:34:20 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 14:34:20 2017 +0800
----------------------------------------------------------------------
ui/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/edac09af/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index 973d1fa..f9523e6 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -60,7 +60,6 @@ under the License.
<version>1.0</version>
<configuration>
<workingDirectory>angular</workingDirectory>
-
<installDirectory>.tmp</installDirectory>
</configuration>
<executions>