From 55b26d7277a2a5780fc79d748103abead9720549 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Sat, 20 Oct 2018 13:47:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 690f4b8ea..a9fb2e9d7 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1264,10 +1264,7 @@ ip_range_in_c=Start IP and end IP in a IP range must with in C subnet ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field ip_range_smaller=Start IP in a IP range should smaller than end IP alternative_values= Alternative values can be %s -<<<<<<< HEAD certificate_error=Wrong format of public key file and private key file public_file_error=Wrong format of public key file private_file_error=Wrong format of private key file -======= ->>>>>>> branch 'develop' of http://192.168.10.125/k18_web/NFS.git keyframe_pic_required=No keyframe pictures have been selected. \ No newline at end of file