You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/05/22 04:58:05 UTC
[06/14] incubator-kylin git commit: update pom for failed release
attemp
update pom for failed release attemp
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/a1735aaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/a1735aaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/a1735aaf
Branch: refs/heads/0.7.1-staging
Commit: a1735aaf8255d6b6a85326193f662fb9ff8c15ff
Parents: 51871fc
Author: Luke Han <lu...@apache.org>
Authored: Wed May 20 22:45:42 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Wed May 20 22:45:42 2015 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a1735aaf/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 9213005..9417503 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -27,15 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
-<<<<<<< HEAD
-<<<<<<< HEAD
<version>0.7.1-incubating</version>
-=======
- <version>0.7.2-incubating-SNAPSHOT</version>
->>>>>>> update version number for hard rollback after failed release attemp
-=======
- <version>0.7.1-incubating-SNAPSHOT</version>
->>>>>>> update version number for hard rollback after failed release attemp
</parent>
<properties>