From 6b560f7df25c0f8157531243fb461eb7ead76ab6 Mon Sep 17 00:00:00 2001 From: tcofoegbu Date: Mon, 1 May 2017 16:39:27 +0100 Subject: [PATCH] Resolve properties file merge conflict with develop --- resources/lang/Messages.properties | 3 --- 1 file changed, 3 deletions(-) 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 -- 1.7.10.2