You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by se...@apache.org on 2019/06/01 11:05:59 UTC
[creadur-rat] branch RAT-244/migratedToJDK7 updated: Fix merge issue
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch RAT-244/migratedToJDK7
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
The following commit(s) were added to refs/heads/RAT-244/migratedToJDK7 by this push:
new bbe20ae Fix merge issue
bbe20ae is described below
commit bbe20ae543f2a989c540152f313fbb489200d70e
Author: Sebb <se...@apache.org>
AuthorDate: Sat Jun 1 12:05:49 2019 +0100
Fix merge issue
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce0bca2..80e9dc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,11 +44,7 @@ agnostic home for software distribution comprehension and audit tools.
<inceptionYear>2006</inceptionYear>
<properties>
<ant.version>1.9.14</ant.version>
-<<<<<<< HEAD
<javaVersion>1.7</javaVersion>
-=======
- <javaVersion>1.6</javaVersion>
->>>>>>> 5277f23e... RAT-244: Fix site build
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
<!-- This is the version of Maven required to use the Rat Maven Plugin -->