Permalink
Browse files

fixed conflict

  • Loading branch information...
Sidney Maestre
Sidney Maestre committed Jul 27, 2012
1 parent b3d5563 commit cb71ddeaf983b60165da4d198d62a45ff5b98e61
Showing with 0 additions and 6 deletions.
  1. +0 −6 java/pom.xml
View
@@ -26,15 +26,9 @@
<version>0.1.0-SNAPSHOT</version>
<properties>
-<<<<<<< HEAD
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <customcode.version>0.4.4</customcode.version>
-=======
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<customcode.version>0.4.4</customcode.version>
->>>>>>> upstream/master
</properties>
<pluginRepositories>

0 comments on commit cb71dde

Please sign in to comment.