JAL-2136 merged develop into branch to fix build failure

[jalview.git] / resources / lang / Messages.properties

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 1184c1f..04bfb30 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1296,4 +1296,10 @@ 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