ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [17/30] incubator-ignite git commit: sprint-3 - Fixed pom.xml
Date Tue, 31 Mar 2015 09:15:07 GMT
sprint-3 - Fixed pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e590f99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e590f99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e590f99

Branch: refs/heads/ignite-443
Commit: 8e590f9967893d31c9587be5aa224cafaeb2ae35
Parents: ce5f168
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Sun Mar 29 23:46:20 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Sun Mar 29 23:46:20 2015 -0700

----------------------------------------------------------------------
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e590f99/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b4a61ce..bcff019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,11 +49,6 @@
         <module>modules/extdata/p2p</module>
         <module>modules/extdata/uri</module>
         <module>modules/clients</module>
-<<<<<<< HEAD
-        <module>examples</module>
-=======
-        <module>modules/tools</module>
->>>>>>> 5fc2cd053467e65872f796e11e3edd2e6017d80d
         <module>modules/spring</module>
         <module>modules/web</module>
         <module>modules/aop</module>
@@ -70,7 +65,7 @@
         <module>modules/codegen</module>
     </modules>
 
-   <profiles>
+    <profiles>
         <profile>
             <id>test</id>
             <build>


Mime
View raw message