解决冲突

Venus/Venus_Core/EventDefine.cs

@@ -50,7 +50,7 @@ namespace Aitex.Core.RT.Log{
 		ERR_PM = 1023,
 		INFO_PM = 1024,
 		WARN_PM = 1025,
-            INFO_Sensor = 1026,
+		INFO_Sensor = 1026,
 		WARN_Sensor = 1027,
 		ERR_Sensor = 1028,
 		ERR_TM = 2000,
@@ -59,6 +59,5 @@ namespace Aitex.Core.RT.Log{
 		EV_EFEM_COMMON_INFO = 4000,
 		WARN_EFEM_COMMON_WARN = 4001,
 		ERR_EFEM_COMMON_FAILED = 4002,
-		
 	}
 }

Venus/Venus_MainPages/Views/HeaterView.xaml.cs

@@ -2,19 +2,7 @@
 using MECF.Framework.Common.DataCenter;
 using MECF.Framework.Common.OperationCenter;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 
 namespace Venus_MainPages.Views

Venus/Venus_RT/Config/LogDefine.json

@@ -415,7 +415,6 @@
   },
   {
     "Id": 1023,
-<<<<<<< HEAD
     "Level": "Error",
     "LogEnum": "ERR_PM",
     "GlobalDescription_zh": "{0}",
@@ -441,6 +440,34 @@
     "Module": "PM",
     "Note": "PM warning"
   },
+
+  {
+    "Id": 1026,
+    "Level": "Info",
+    "LogEnum": "INFO_Sensor",
+    "GlobalDescription_zh": "{0}",
+    "GlobalDescription_en": "{0}",
+    "Module": "PM",
+    "Note": "Sensor log"
+  },
+  {
+    "Id": 1027,
+    "Level": "Warning",
+    "LogEnum": "WARN_Sensor",
+    "GlobalDescription_zh": "{0}",
+    "GlobalDescription_en": "{0}",
+    "Module": "PM",
+    "Note": "Sensor warning"
+  },
+  {
+    "Id": 1028,
+    "Level": "Error",
+    "LogEnum": "ERR_Sensor",
+    "GlobalDescription_zh": "{0}",
+    "GlobalDescription_en": "{0}",
+    "Module": "PM",
+    "Note": "Sensor Error"
+  },
   {
     "Id": 2000,
     "Level": "Error",
@@ -494,31 +521,5 @@
     "GlobalDescription_en": "{0}.",
     "Module": "EFEM",
     "Note": "EFEM Failed"
-=======
-    "Level": "Info",
-    "LogEnum": "INFO_Sensor",
-    "GlobalDescription_zh": "{0}",
-    "GlobalDescription_en": "{0}",
-    "Module": "PM",
-    "Note": "Sensor log"
-  },
-  {
-    "Id": 1024,
-    "Level": "Warning",
-    "LogEnum": "WARN_Sensor",
-    "GlobalDescription_zh": "{0}",
-    "GlobalDescription_en": "{0}",
-    "Module": "PM",
-    "Note": "Sensor warning"
-  },
-  {
-    "Id": 1025,
-    "Level": "Error",
-    "LogEnum": "ERR_Sensor",
-    "GlobalDescription_zh": "{0}",
-    "GlobalDescription_en": "{0}",
-    "Module": "PM",
-    "Note": "Sensor Error"
->>>>>>> bba7284... 1.添加加热功能
   }
 ]