X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=7bf0474b895a836c86c181a526f8749626eef992;hb=6b560f7df25c0f8157531243fb461eb7ead76ab6;hp=74c42b7214ecba0eceac0ed1206cecc630c0bb21;hpb=496e2a7b7be5201d8739523b95fce5899e71aa8a;p=jalview.git

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 74c42b7..7bf0474 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1299,10 +1299,7 @@ label.edit_sequence_url_link = Edit sequence URL link
 warn.name_cannot_be_duplicate = User-defined URL names must be unique and cannot be MIRIAM ids
 label.invalid_name = Invalid Name !
 label.output_seq_details = Output Sequence Details to list all database references
-<<<<<<< HEAD
 label.phyre2_model_prediction = 3D Protein Model prediction with Phyre2
 label.run_phyre2_prediction = Run Phyre2 Prediction
 status.obtaining_mapping_with_phyre2_template_alignment = Obtaining mapping with Phyre2 Template alignment 
-=======
 label.urllinks = Links
->>>>>>> develop