From 7377fb763b212300084f293fcfb6789eb5e49ff3 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 | 6 ------ 1 file changed, 6 deletions(-) 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; } */ -- 1.7.10.2