merge

bThink-BGU · Dec 5, 2020 · fe4d3c3 · fe4d3c3
1 parent 711cabe
commit fe4d3c3
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -159,7 +159,6 @@
                 <configuration>
                     <source>8</source>
                 </configuration>
-<<<<<<< HEAD
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -168,8 +167,6 @@
                         </goals>
                     </execution>
                 </executions>
-=======
->>>>>>> develop
             </plugin>
         </plugins>        
     </build>