JAL-952 fixed unresolved conflict breaking build

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 8996691..84b660f 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -252,16 +252,10 @@ public class ColourSchemeProperty
     {
       index = TCOFFEE;
     }
-<<<<<<< HEAD
-   
-    
-    
-=======
     else if (cs instanceof RNAHelicesColour)
     {
       index = RNAHELIX;
     }
->>>>>>> JAL-952_rnahelix
     /*
      * else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
      */