REPORT-9953

6 years ago · 2b0b7d6af1
1 changed files with 0 additions and 3 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
@ -2715,9 +2715,7 @@ Fine-Designer_Sheet_Label_Page_Display_Position=sheet label page display positio
 Fine-Plugin_Shop_Need_Install_Version=Need to update to the 10.0 plug-in store, updated?
 Fine-Designer_Submit_Condition=Submission conditions
 Fine-Designer_About_Remark_Info=*If the above route can not contact the staff, or after the contact has not been satisfactorily resolved, please call the president to do 24 hours call: {R1}, to serve you.
-<<<<<<< HEAD
 Fine-Designer_Allow_Full_Screen=Allow full screen
-=======
 Fine-Design_Log_Level_Info=Info
 Fine-Design_Log_Level_Warn=Warn
 Fine-Design_Log_Level_Error=Error
@ -2783,4 +2781,3 @@ Fine-Design_Chart_Enable_Field_Value=Enable Field Value
 Fine-Design_Chart_Legend_Name=Legend(Series) Name
 Fine-Design_Chart_Legend_Value=Legend(Series) Value
 Fine-Design_Chart_Label_Content=Label Content
->>>>>>> 4d6406dd76787c1c3802c4c471a2e1933c93495c