web app pom correction

Tanaguru · May 22, 2014 · 5429667 · 5429667
1 parent 6403d41
commit 5429667
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml
@@ -96,13 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.opens</groupId>
-<<<<<<< HEAD
             <artifactId>contrast-finder-hsv</artifactId>
-            <version>0.3.2</version>
-=======
-            <artifactId>color-finder-hsv</artifactId>
-            <version>0.3.3</version>
->>>>>>> release-0.3.3
             <type>jar</type>
         </dependency>
         <dependency>