Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed conflict

  • Loading branch information...
commit cb71ddeaf983b60165da4d198d62a45ff5b98e61 1 parent b3d5563
@SidneyAllen authored
Showing with 0 additions and 6 deletions.
  1. +0 −6 java/pom.xml
View
6 java/pom.xml
@@ -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>
Please sign in to comment.
Something went wrong with that request. Please try again.