git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8b985fa
)
JAL-952 fixed unresolved conflict breaking build
author
Jim Procter
<jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 12:30:26 +0000
(13:30 +0100)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 14:21:35 +0000
(15:21 +0100)
src/jalview/schemes/ColourSchemeProperty.java
patch
|
blob
|
history
diff --git
a/src/jalview/schemes/ColourSchemeProperty.java
b/src/jalview/schemes/ColourSchemeProperty.java
index
8996691
..
cb2eea7
100755
(executable)
--- 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 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;
/**
* 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!
/**
* DOCUMENT ME!
@@
-252,16
+252,10
@@
public class ColourSchemeProperty
{
index = TCOFFEE;
}
{
index = TCOFFEE;
}
-<<<<<<< HEAD
-
-
-
-=======
else if (cs instanceof RNAHelicesColour)
{
index = RNAHELIX;
}
else if (cs instanceof RNAHelicesColour)
{
index = RNAHELIX;
}
->>>>>>> JAL-952_rnahelix
/*
* else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
*/
/*
* else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
*/
@@
-356,18
+350,15
@@
public class ColourSchemeProperty
ret = "T-Coffee Scores";
break;
ret = "T-Coffee Scores";
break;
-<<<<<<< HEAD
case RNAINTERACTION:
ret = "RNA Interaction type";
break;
case RNAINTERACTION:
ret = "RNA Interaction type";
break;
-=======
case RNAHELIX:
ret = "RNA Helices";
break;
case RNAHELIX:
ret = "RNA Helices";
break;
->>>>>>> JAL-952_rnahelix
/*
* case COVARIATION: ret = "Covariation";
*
/*
* case COVARIATION: ret = "Covariation";
*