From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 4 Aug 2017 08:12:35 +0000 (+0100)
Subject: Merge branch 'develop' into documentation/JAL-2418_release2102
X-Git-Tag: Release_2_10_2~3^2~15^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=751c4a3adbd5d126995cd805e5afa5c9ceb3a0bd;hp=1ab6c607f768ad7dfae18bd4ff21eb34183f57cd;p=jalview.git

Merge branch 'develop' into documentation/JAL-2418_release2102
---

diff --git a/examples/exampleFeatures.txt b/examples/exampleFeatures.txt
index cc159d1..9e65534 100755
--- a/examples/exampleFeatures.txt
+++ b/examples/exampleFeatures.txt
@@ -1,5 +1,5 @@
 ST-TURN-IIL	blue
-GAMMA-TURN-CLASSIC	lightGray
+GAMMA-TURN-CLASSIC	lightgray
 BETA-TURN-IR	9a6a94
 BETA-TURN-IL	d6a6ca
 BETA-BULGE	1dc451