From 95fdd71e04a1756b4789a24364e6b98af0f3f217 Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <alejandro.gervasio@gmail.com>
Date: Mon, 8 Oct 2018 14:38:24 -0300
Subject: [PATCH] Update pom.xml

---
 javaxval/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/javaxval/pom.xml b/javaxval/pom.xml
index 32b0878ce8..86a7e6955b 100644
--- a/javaxval/pom.xml
+++ b/javaxval/pom.xml
@@ -65,15 +65,9 @@
         <validation-api.version>2.0.1.Final</validation-api.version>
         <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
         <javax.el-api.version>3.0.0</javax.el-api.version>
-<<<<<<< HEAD
         <javax.el.version>3.0.0</javax.el.version>    
-        <javax.el.version>2.2.6</javax.el.version>    
-    <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
-=======
-        <javax.el.version>3.0.0</javax.el.version>        
         <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
->>>>>>> 9060d6c3bafc0411cbc7f7234f1ff4d5b6edf535
         <junit.version>4.12</junit.version>
         <assertj.version>3.11.1</assertj.version>
     </properties>    
-</project>
\ No newline at end of file
+</project>