From f82eb8cf80395423612005013b2f1e072931b7fa Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Wed, 4 Jun 2014 13:30:26 +0100 Subject: [PATCH] JAL-952 fixed unresolved conflict breaking build --- src/jalview/schemes/ColourSchemeProperty.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java index 8996691..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! @@ -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; } */ @@ -356,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"; * -- 1.7.10.2