From: Jim Procter <jprocter@dundee.ac.uk>
Date: Wed, 4 Jun 2014 14:22:07 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Jalview_2_9~186
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4c112dec58b77e391ad574cd18d147b258884a97;hp=7377fb763b212300084f293fcfb6789eb5e49ff3;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
---

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";
      *