Merge branch 'master' of github.com:OpenHFT/Java-Runtime-Compiler

Rob Austin · Rob Austin · commit bb2130b472cf · 2014-04-11T13:03:18.000+01:00
Conflicts:
	compiler/pom.xml
diff --git a/compiler/pom.xml b/compiler/pom.xml
@@ -15,21 +15,24 @@
   ~ limitations under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 
     <parent>
         <groupId>net.openhft</groupId>
         <artifactId>java-parent-pom</artifactId>
+<<<<<<< HEAD
         <version>1.0.1-SNAPSHOT</version>
         <relativePath/>
+=======
+        <version>1.0.0</version>
+        <relativePath />
+>>>>>>> a50f7b6b27b9231e9e3ebc6023c04541964c79e2
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>compiler</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>OpenHFT/Java-Runtime-Compiler</name>
