From 39ccfa218b72eada52d69d59f3aac8518875da1d Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 31 Oct 2019 14:52:29 +0800 Subject: [PATCH] update --- .../src/main/resources/com/fr/design/i18n/main.properties | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties index 1767476..552dbde 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties @@ -2419,9 +2419,6 @@ Fine-Design_Form_Watermark_Gap=Watermark Gap Fine-Design_Basic_Remote_Design_Choose_Custom=Choose Design Custom Fine-Design_Update_Info_Information=prompt message Fine-Design_Form_Functional_When_Unactivated=Widget is selectable -<<<<<<<<< Temporary merge branch 1 Fine-Designer_PC_Fit_Attr=Browser adaptive attr Fine-Designer_PC_Element_Case_Fit_Attr=Browser ElementCase adaptive attr -========= -Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double click/two finger zoom ->>>>>>>>> Temporary merge branch 2 +Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double click/two finger zoom \ No newline at end of file