You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/05/27 06:35:03 UTC
[38/50] [abbrv] 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/7435b335
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7435b335
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7435b335
Branch: refs/heads/0.8.0
Commit: 7435b335bfb48f1e502bef7263d19cdd842e32d8
Parents: ef7879a
Author: Luke Han <lu...@apache.org>
Authored: Wed May 20 22:45:42 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed May 27 12:26:14 2015 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7435b335/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>