Fixed merge issue

rshiva777 · Sep 29, 2012 · b2dbba1 · b2dbba1
1 parent 019435f
commit b2dbba1
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/gameoflife-web/pom.xml b/gameoflife-web/pom.xml
@@ -121,17 +121,8 @@
         <dependency>
             <groupId>com.wakaleo.gameoflife</groupId>
             <artifactId>gameoflife-core</artifactId>
-<<<<<<< HEAD
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.wakaleo.gameoflife</groupId>
-            <artifactId>gameoflife-webservice</artifactId>
-            <version>0.9.66-SNAPSHOT</version>
-=======
-            <version>0.9.67-SNAPSHOT</version>
->>>>>>> master
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>