From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 8 Oct 2015 12:00:49 +0000 (+0100)
Subject: Merge branch 'Release_2_9_0b1_Branch' of https://source.jalview.org/git/jalview.git... 
X-Git-Tag: Release_2_9_0b2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f6bde21f2fba3f12afedd6486bc8326a63f1373f;hp=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git

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

diff --git a/examples/applets.html b/examples/applets.html
index 193ed7c..4c3e942 100644
--- a/examples/applets.html
+++ b/examples/applets.html
@@ -168,7 +168,7 @@ Try out JalviewLite by pressing one of the buttons below.<br/>
 	secondary structure annotation</td>
     </tr>
   </table>
-<!--  <p>
+  <p>
     <h2>Linked Protein and cDNA alignments for a family of Steroid Receptors</h2>
   </p>
   <table width="90%">
@@ -203,4 +203,3 @@ Try out JalviewLite by pressing one of the buttons below.<br/>
       </td>
     </tr>
   </table>
--->