From: Jim Procter <jprocter@dundee.ac.uk>
Date: Wed, 4 Jun 2014 16:17:13 +0000 (+0100)
Subject: Merge branch 'develop' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~79
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fca189f1ddefa155881dedeeb0f21c1cd0905e74;hp=5cfe27c03078109da32f0d5be8be57080fb0cd25;p=jalview.git

Merge branch 'develop' into Release_2_8_2_Branch
---

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 84b660f..cb2eea7 100755
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -89,14 +89,14 @@ public class ColourSchemeProperty
   
   public static final int RNAHELIX = 16;
 
-  public static final int RNAINTERACTION = 16;
+  public static final int RNAINTERACTION = 17;
 
   /**
    * index of first colourscheme (includes 'None')
    */
   public static final int FIRST_COLOUR = NONE;
 
-  public static final int LAST_COLOUR = RNAHELIX;
+  public static final int LAST_COLOUR = RNAINTERACTION;
 
   /**
    * DOCUMENT ME!
@@ -350,18 +350,15 @@ public class ColourSchemeProperty
       ret = "T-Coffee Scores";
 
       break;
-<<<<<<< HEAD
       
     case RNAINTERACTION:
         ret = "RNA Interaction type";
 
         break;
-=======
     case RNAHELIX:
       ret = "RNA Helices";
 
       break;
->>>>>>> JAL-952_rnahelix
     /*
      * case COVARIATION: ret = "Covariation";
      *