From dd9828f257789ebf6b649f47de1d5324edb7c5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bro=C4=8Dko?= <erik.brocko@letemsvetemapplem.eu>
Date: Fri, 5 Oct 2018 19:50:39 +0200
Subject: [PATCH] resolved conflicts

---
 Stats/pom.xml | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/Stats/pom.xml b/Stats/pom.xml
index 137a026..63d3864 100644
--- a/Stats/pom.xml
+++ b/Stats/pom.xml
@@ -25,7 +25,6 @@
       </plugin>
       <plugin>
         <artifactId>exec-maven-plugin</artifactId>
-<<<<<<< HEAD
         <version>1.6.0</version>
         <groupId>org.codehaus.mojo</groupId>
         <executions>
@@ -44,27 +43,6 @@
           </arguments>
         </configuration>
       </plugin>
-=======
-          <version>1.6.0</version>
-          <groupId>org.codehaus.mojo</groupId>
-          <executions>
-            <execution>
-              <id>Version Calculation</id>
-              <phase>deploy</phase>
-              <goals>
-                <goal>exec</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <executable>${project.parent.basedir}/deploy_feature.sh</executable>
-            <arguments>
-              <argument>${project.build.directory}/${project.build.finalName}.jar</argument>
-              <argument>${project.artifactId}</argument>
-            </arguments>
-          </configuration>
-        </plugin>
->>>>>>> 6d6cb733a9fd777be26f470880c2af6ca0c7f8c2
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <configuration>