update

5 years ago · 39ccfa218b
1 changed files with 1 additions and 4 deletions
--- 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