MarwLand/MarwFeatures
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
Erik Bročko 2018-10-05 19:50:39 +02:00
parent 4c18a79dc6
commit dd9828f257
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Stats/pom.xml
View File

@ -25,7 +25,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<<<<<<< HEAD
<version>1.6.0</version> <version>1.6.0</version>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<executions> <executions>
@ -44,27 +43,6 @@
</arguments> </arguments>
</configuration> </configuration>
</plugin> </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> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<configuration> <configuration>