- clean up merge conflicts

JSQLParser · Oct 12, 2012 · bf5d17f · bf5d17f
2 parents 1047bb1 + e976696
commit bf5d17f
Show file tree

Hide file tree

Showing 3 changed files with 2,637 additions and 2,637 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,8 +28,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.5</source>
+					<target>1.5</target>
 				</configuration>
 			</plugin>
 			<plugin>