Release branch version release

EBISPOT · Jul 7, 2022 · 57d828e · 57d828e
1 parent 0cb5815
commit 57d828e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/goci-data-services/goci-data-validation-services/pom.xml b/goci-data-services/goci-data-validation-services/pom.xml
@@ -5,22 +5,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>goci-data-validation-services</artifactId>
-<<<<<<< HEAD
-    <version>3.3.2</version>
-=======
+
     <version>3.3.3</version>
->>>>>>> release-traits-bugfix
+
 
     <name>GOCI Data Validation Services</name>
     <description>Classes used to validate GWAS data</description>
 
     <parent>
         <groupId>uk.ac.ebi.spot</groupId>
-<<<<<<< HEAD
-        <version>3.3.2</version>
-=======
+
         <version>3.3.3</version>
->>>>>>> release-traits-bugfix
+
         <artifactId>goci-parent</artifactId>
         <relativePath>../../goci-parent/pom.xml</relativePath>
     </parent>

diff --git a/software-release.sh b/software-release.sh
@@ -5,11 +5,9 @@
 
 # Ensure all branches ready for release are merged into dev / master
 
-<<<<<<< HEAD
-DEV_BRANCH='release-traits-functionality'
-=======
+
 DEV_BRANCH='release-traits-bugfix'
->>>>>>> release-traits-bugfix
+
 MASTER_BRANCH='2.x-stable'
 
 echo "What is the new version number ?"