From: Jim Procter <jprocter@dundee.ac.uk>
Date: Wed, 4 Jun 2014 12:30:26 +0000 (+0100)
Subject: JAL-952 fixed unresolved conflict breaking build
X-Git-Tag: Release_2_8_2b1^2~81
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7377fb763b212300084f293fcfb6789eb5e49ff3;p=jalview.git

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
--- 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; }
      */