X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=04bfb30602ec3a0f059e75e7a92f08428ce16e43;hb=c0b7a760fe1ced5fe25ee3c3fd272e03f7526fa2;hp=1184c1f8a83b05c4d407eed7561b7f69f225b5b7;hpb=7a31b18c382cbb3caaed45ad014dfb5e53522af1;p=jalview.git

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 1184c1f..04bfb30 100644
--- 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