fix

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties

@@ -635,8 +635,4 @@ Fine-Design_Chart_Data_Check=Data Check
 Fine-Design_Chart_Polyline_Style=Polyline Style
 Fine-Design_Chart_Color_Background=backgournd color
 Fine-Design_Chart_Polyline_Type=polyline type
-<<<<<<< HEAD
-
 Fine-Design_Chart_Category_Use_Name=Category Name
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en_US.properties

@@ -635,8 +635,4 @@ Fine-Design_Chart_Axis_Interactive=Axis Interactive
 Fine-Design_Chart_Data_Check=Data Check
 Fine-Design_Chart_Color_Background=backgournd color
 Fine-Design_Chart_Polyline_Type=polyline type
-<<<<<<< HEAD
-
 Fine-Design_Chart_Category_Use_Name=Category Name
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties

@@ -635,8 +635,4 @@ Fine-Design_Chart_Axis_Interactive=\u8EF8\u30A4\u30F3\u30BF\u30E9\u30AF\u30B7\u3
 Fine-Design_Chart_Data_Check=\u30C7\u30FC\u30BF\u76E3\u8996
 Fine-Design_Chart_Color_Background=\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30AB\u30E9\u30FC
 Fine-Design_Chart_Polyline_Type=\u6298\u308C\u7DDA\u30BF\u30A4\u30D7
-<<<<<<< HEAD
-
 Fine-Design_Chart_Category_Use_Name=\u5206\u985E\u540D
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties

@@ -635,8 +635,4 @@ Fine-Design_Chart_Axis_Interactive=Axis Interactive
 Fine-Design_Chart_Data_Check=Data Check
 Fine-Design_Chart_Color_Background=backgournd color
 Fine-Design_Chart_Polyline_Type=polyline type
-<<<<<<< HEAD
-
 Fine-Design_Chart_Category_Use_Name=\uCE74\uD14C\uACE0\uB9AC\uBA85
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_CN.properties

@@ -635,8 +635,4 @@ Fine-Design_Chart_Axis_Interactive=\u5750\u6807\u8F74\u4EA4\u4E92\u5C5E\u6027
 Fine-Design_Chart_Data_Check=\u6570\u636E\u76D1\u63A7
 Fine-Design_Chart_Color_Background=\u80CC\u666F\u989C\u8272
 Fine-Design_Chart_Polyline_Type=\u6298\u7EBF\u7EBF\u578B
-<<<<<<< HEAD
-
 Fine-Design_Chart_Category_Use_Name=\u5206\u7C7B\u540D
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties

@@ -635,8 +635,4 @@ Fine-Design_Chart_Axis_Interactive=Axis Interactive
 Fine-Design_Chart_Data_Check=Data Check
 Fine-Design_Chart_Color_Background=\u80CC\u666F\u984F\u8272
 Fine-Design_Chart_Polyline_Type=\u6298\u7DDA\u7DDA\u578B
-<<<<<<< HEAD
-
 Fine-Design_Chart_Category_Use_Name=\u5206\u985E\u540D\u7A31
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties

@@ -2218,13 +2218,10 @@ Fine-Design_Basic_Plugin_Estate_Parameter_Null_Text=
 Fine-Design_Basic_Plugin_Estate_Radio-Group=
 Fine-Design_Basic_Plugin_Engine_Detail_Message=\u8BE6\u7EC6\u4FE1\u606F
 Fine-Design_Basic_Plugin_Save_Path=\u4FDD\u5B58\u8DEF\u5F84
-<<<<<<< HEAD
-=======
 Fine-Design_Function_Form_Widget_Edit_Toolbar=form widget edit(toolbar)
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=form widget edit(popup menu)
 Fine-Design_Function_Mobile_Template_Frm=mobile template(frm)
 Fine-Design_Function_Mobile_Template_Cpt=mobile template(cpt)
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1
 Fine-Design_Basic_Connection_Failed=Connection Failed
 Fine-Design_Basic_Plugin_Column_Axis=
 Fine-Design_Basic_Plugin_Simple_General=
@@ -2240,9 +2237,6 @@ Fine-Design_Basic_Plugin_Web_Apply=
 Fine-Design_Mobile_Preview=Mobile Preview
 Fine-Design_Basic_Plugin_Estate_Selected_Font=
 Fine-Design_Basic_Plugin_Estate_Widget_Value=
-<<<<<<< HEAD
-
-
 Fine-Design_Basic_Remote_Design_Choose_Member=Choose Design Member
 Fine-Design_No_Print_Settings_In_IE=No Print Settings in IE
 Fine-Design_Basic_Confirm_Delete_Unlock_File=Locked templates cannot be deleted. Delete other selected templates?
@@ -2268,5 +2262,3 @@ Fine-Design_Basic_Folder_Name_Duplicate=Folder "{}" already exist
 Fine-Design_Basic_AlphaFine_Search_Type=Search Type
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=Intelligent Customer Service
 Fine-Design_Report_Alpha_Hot_No_Item=
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties

@@ -2232,13 +2232,10 @@ Fine-Design_Basic_Plugin_Save_Path=Saving Path
 Fine-Design_Basic_Plugin_Estate_Radio-Group=Common button group controls of real estate
 Fine-Design_Basic_Plugin_Engine_Detail_Message=Detail Message
 Fine-Design_Basic_Plugin_Save_Path=need work
-<<<<<<< HEAD
-=======
 Fine-Design_Function_Form_Widget_Edit_Toolbar=form widget edit(toolbar)
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=form widget edit(popup menu)
 Fine-Design_Function_Mobile_Template_Frm=mobile template(frm)
 Fine-Design_Function_Mobile_Template_Cpt=mobile template(cpt)
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1
 Fine-Design_Basic_Connection_Failed=Connection Failed
 Fine-Design_Basic_Plugin_Column_Axis=Column Axis
 Fine-Design_Basic_Plugin_Simple_General=Simple custom query
@@ -2252,7 +2249,6 @@ Fine-Design_Basic_Plugin_Get_Cube=
 Fine-Design_Basic_Plugin_DataBase_Connection=Database Connection
 Fine-Design_Basic_Plugin_Web_Apply=Web Application
 Fine-Design_Mobile_Preview=Mobile Preview
-<<<<<<< HEAD
 Fine-Design_Basic_Remote_Design_Choose_Member=Choose Design Member
 Fine-Design_No_Print_Settings_In_IE=No Print Settings in IE
 Fine-Design_Basic_Confirm_Delete_Unlock_File=Locked templates cannot be deleted. Delete other selected templates?
@@ -2279,5 +2275,3 @@ Fine-Design_Report_Mobile_Screen_Zoom_In=
 Fine-Design_Basic_AlphaFine_Search_Type=Search Type
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=Intelligent Customer Service
 Fine-Design_Report_Alpha_Hot_No_Item=There is no content in this topic.
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties

@@ -2216,13 +2216,10 @@ Fine-Design_Basic_Plugin_Estate_Parameter_Null_Text=\u30D1\u30E9\u30E1\u30FC\u30
 Fine-Design_Basic_Plugin_Estate_Radio-Group=\u4E0D\u52D5\u7523\u696D\u901A\u7528\u30DC\u30BF\u30F3\u30BB\u30C3\u30C8\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB
 Fine-Design_Basic_Plugin_Engine_Detail_Message=\u8A73\u7D30\u60C5\u5831
 Fine-Design_Basic_Plugin_Save_Path=\u4FDD\u5B58\u8DEF\u5F84
-<<<<<<< HEAD
-=======
 Fine-Design_Function_Form_Widget_Edit_Toolbar=
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=
 Fine-Design_Function_Mobile_Template_Frm=
 Fine-Design_Function_Mobile_Template_Cpt=
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1
 Fine-Design_Basic_Plugin_Column_Axis=
 Fine-Design_Basic_Plugin_Simple_General=
 Fine-Design_Basic_Plugin_Query_Type=
@@ -2236,7 +2233,6 @@ Fine-Design_Basic_Plugin_Web_Apply=
 Fine-Design_Mobile_Preview=
 Fine-Design_Basic_Plugin_Estate_Selected_Font=
 Fine-Design_Basic_Plugin_Estate_Widget_Value=
-<<<<<<< HEAD
 
 Fine-Design_Basic_Remote_Design_Choose_Member=Choose Design Member
 Fine-Design_No_Print_Settings_In_IE=
@@ -2251,5 +2247,3 @@ Fine-Design_Double_Side_Print=
 Fine-Design_Basic_AlphaFine_Search_Type=
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Report_Alpha_Hot_No_Item=
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties

@@ -2216,13 +2216,10 @@ Fine-Design_Basic_Plugin_Estate_Parameter_Null_Text=\uB9E4\uAC1C\uBCC0\uC218\uAC
 Fine-Design_Basic_Plugin_Estate_Radio-Group=\uBD80\uB3D9\uC0B0\uC5C5\uACC4\uBC94\uC6A9\uD0A4\uD328\uB4DC\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4
 Fine-Design_Basic_Plugin_Engine_Detail_Message=\uB514\uD14C\uC77C\uBA54\uC138\uC9C0
 Fine-Design_Basic_Plugin_Save_Path=\u4FDD\u5B58\u8DEF\u5F84
-<<<<<<< HEAD
-=======
 Fine-Design_Function_Form_Widget_Edit_Toolbar=
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=
 Fine-Design_Function_Mobile_Template_Frm=
 Fine-Design_Function_Mobile_Template_Cpt=
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1
 Fine-Design_Basic_Plugin_Column_Axis=
 Fine-Design_Basic_Plugin_Simple_General=
 Fine-Design_Basic_Plugin_Refresh_Parameter_In_SQL=
@@ -2237,8 +2234,6 @@ Fine-Design_Basic_Plugin_Web_Apply=
 Fine-Design_Mobile_Preview=
 Fine-Design_Basic_Plugin_Estate_Selected_Font=\uC120\uD0DD\uD55C\uAE00\uAF34
 Fine-Design_Basic_Plugin_Estate_Widget_Value=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uAC12
-<<<<<<< HEAD
-
 Fine-Design_Basic_Remote_Design_Choose_Member=Choose Design Member
 Fine-Design_No_Print_Settings_In_IE=
 Fine-Design_Report_AlphaFine_Hot=
@@ -2252,5 +2247,3 @@ Fine-Design_Double_Side_Print=
 Fine-Design_Basic_AlphaFine_Search_Type=
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Report_Alpha_Hot_No_Item=
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties

@@ -2216,13 +2216,10 @@ Fine-Design_Basic_Plugin_Estate_Parameter_Null_Text=\u53C2\u6570\u4E3A\u7A7A\u66
 Fine-Design_Basic_Plugin_Estate_Radio-Group=\u5730\u4EA7\u884C\u4E1A\u901A\u7528\u6309\u94AE\u7EC4\u63A7\u4EF6
 Fine-Design_Basic_Plugin_Engine_Detail_Message=\u8BE6\u7EC6\u4FE1\u606F
 Fine-Design_Basic_Plugin_Save_Path=\u4FDD\u5B58\u8DEF\u5F84
-<<<<<<< HEAD
-=======
 Fine-Design_Function_Form_Widget_Edit_Toolbar=\u8868\u5355\u7EC4\u4EF6\u7F16\u8F91(\u5DE5\u5177\u680F)
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=\u8868\u5355\u7EC4\u4EF6\u7F16\u8F91(\u53F3\u952E\u83DC\u5355)
 Fine-Design_Function_Mobile_Template_Frm=\u79FB\u52A8\u7AEF\u6A21\u7248\uFF08frm\uFF09
 Fine-Design_Function_Mobile_Template_Cpt=\u79FB\u52A8\u7AEF\u6A21\u7248\uFF08cpt\uFF09
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1
 Fine-Design_Basic_Connection_Failed=\u8FDE\u63A5\u5931\u8D25
 Fine-Design_Basic_Plugin_Column_Axis=\u5217\u8F74
 Fine-Design_Basic_Plugin_Column_Measure=\u5217\u8F74/\u5EA6\u91CF\u503C
@@ -2240,8 +2237,6 @@ Fine-Design_Basic_Plugin_Web_Apply=WEB\u5E94\u7528
 Fine-Design_Mobile_Preview=\u79FB\u52A8\u7AEF\u9884\u89C8
 Fine-Design_Basic_Plugin_Estate_Selected_Font=\u9009\u4E2D\u5B57\u4F53
 Fine-Design_Basic_Plugin_Estate_Widget_Value=\u63A7\u4EF6\u503C
-<<<<<<< HEAD
-
 Fine-Design_Basic_Remote_Design_Choose_Member=\u9009\u62E9\u8BBE\u8BA1\u6210\u5458
 Fine-Design_No_Print_Settings_In_IE=IE\u6D4F\u89C8\u5668\u4E2D\u4E0D\u663E\u793A\u6253\u5370\u8BBE\u7F6E
 Fine-Design_Basic_Confirm_Delete_Unlock_File=\u88AB\u9501\u5B9A\u6A21\u677F\u65E0\u6CD5\u5220\u9664\uFF0C\u662F\u5426\u5220\u9664\u9009\u4E2D\u7684\u5176\u4ED6\u6A21\u677F\uFF1F
@@ -2267,5 +2262,3 @@ Fine-Design_Basic_Folder_Name_Duplicate=\u63D0\u793A\uFF1A\u6587\u4EF6\u5939\u54
 Fine-Design_Basic_AlphaFine_Search_Type= \u641C\u7D22\u65B9\u5F0F
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=\u667A\u80FD\u5BA2\u670D
 Fine-Design_Report_Alpha_Hot_No_Item=\u8BE5\u680F\u76EE\u4E0B\u6682\u65E0\u70ED\u70B9\u95EE\u9898
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1

design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

@@ -2218,13 +2218,10 @@ Fine-Design_Basic_Plugin_Estate_Parameter_Null_Text=\u53C3\u6578\u70BA\u7A7A\u98
 Fine-Design_Basic_Plugin_Estate_Radio-Group=\u901A\u7528\u6309\u9215\u7D44\u63A7\u5236\u9805
 Fine-Design_Basic_Plugin_Engine_Detail_Message=\u8A73\u7D30\u4FE1\u606F
 Fine-Design_Basic_Plugin_Save_Path=\u4FDD\u5B58\u8DEF\u5F91
-<<<<<<< HEAD
-=======
 Fine-Design_Function_Form_Widget_Edit_Toolbar=\u8868\u55AE\u7D44\u4EF6\u7DE8\u8F2F\uFF08\u5DE5\u5177\u5217\uFF09
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=\u8868\u55AE\u7D44\u4EF6\u7DE8\u8F2F\uFF08\u53F3\u9375\u83DC\u55AE\uFF09
 Fine-Design_Function_Mobile_Template_Frm=\u79FB\u52D5\u7AEF\u6A21\u7248\uFF08frm\uFF09
 Fine-Design_Function_Mobile_Template_Cpt=\u79FB\u52D5\u7AEF\u6A21\u7248\uFF08cpt\uFF09
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1
 Fine-Design_Basic_Connection_Failed=\u9023\u63A5\u5931\u6557
 Fine-Design_Basic_Plugin_Column_Axis=
 Fine-Design_Basic_Plugin_Simple_General=
@@ -2240,7 +2237,6 @@ Fine-Design_Basic_Plugin_Web_Apply=
 Fine-Design_Mobile_Preview=\u79FB\u52D5\u7AEF\u9810\u89BD
 Fine-Design_Basic_Plugin_Estate_Selected_Font=\u9078\u4E2D\u5B57\u9AD4
 Fine-Design_Basic_Plugin_Estate_Widget_Value=\u5C0F\u5DE5\u5177\u503C
-<<<<<<< HEAD
 Fine-Design_Basic_Remote_Design_Choose_Member=\u9078\u64C7\u8A2D\u8A08\u6210\u54E1
 Fine-Design_No_Print_Settings_In_IE=IE\u700F\u89BD\u5668\u4E2D\u4E0D\u986F\u793A\u5217\u5370\u8A2D\u5B9A
 Fine-Design_Basic_Confirm_Delete_Unlock_File=\u88AB\u9396\u5B9A\u6A21\u677F\u7121\u6CD5\u522A\u9664\uFF0C\u662F\u5426\u522A\u9664\u9078\u4E2D\u7684\u5176\u4ED6\u6A21\u677F\uFF1F
@@ -2266,5 +2262,3 @@ Fine-Design_Basic_Folder_Name_Duplicate=Folder "{}" already exist
 Fine-Design_Basic_AlphaFine_Search_Type=
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Report_Alpha_Hot_No_Item=
-=======
->>>>>>> e031fbb9d058efdafef075a16121f59e83729bf1