added one more git merge conflict fix

Signed-off-by: Jan Supol <jan.supol@oracle.com>
eclipse-ee4j · Jan 31, 2019 · 5533dba · 5533dba
1 parent 9e0e0a0
commit 5533dba
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/ext/mvc-bean-validation/pom.xml b/ext/mvc-bean-validation/pom.xml
@@ -64,11 +64,6 @@
                     <artifactId>javax.el-api</artifactId>
                 </exclusion>
                 <exclusion>
-<<<<<<< HEAD
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                </exclusion>
-=======
                     <groupId>jakarta.el</groupId>
                     <artifactId>jakarta.el-api</artifactId>
                 </exclusion>
@@ -80,7 +75,6 @@
                     <groupId>org.glassfish</groupId>
                     <artifactId>jakarta.el</artifactId>
                 </exclusion>
->>>>>>> MSTR/EE4J_8
             </exclusions>
         </dependency>
     </dependencies>