Set next release to be 3.1.0.

[deliverable/tracecompass.git] / org.eclipse.linuxtools.gdbtrace.core / pom.xml

diff --git a/org.eclipse.linuxtools.gdbtrace.core/pom.xml b/org.eclipse.linuxtools.gdbtrace.core/pom.xml
index 58ac47e8e94ca5f6f132c3543c8dc1d934ebc432..9255e20eefed6a7199b0cc8c3d9fdde2bbd6760a 100644 (file)
--- a/org.eclipse.linuxtools.gdbtrace.core/pom.xml
+++ b/org.eclipse.linuxtools.gdbtrace.core/pom.xml
@@ -14,16 +14,12 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.core</artifactId>
   <groupId>org.eclipse.linuxtools.gdbtrace</groupId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>1.1.0-SNAPSHOT</version>
->>>>>>> master
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools GDB Tracepoint Analysis Core Plug-in</name>