解决合并bug

CNAS_DBSync/ActivationForm.cs

@@ -66,7 +66,7 @@ namespace CNAS_DBSync
             try
             {
                 //绕过验证
-                if (ValidateActivationCode(activationCode))
+                if (!ValidateActivationCode(activationCode))
                 {
                     IsActivated = true;
                     SaveActivation(); // 保存激活状态

dll/Data/SyncInStrumentData.mes

@@ -1 +1 @@
-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
+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

dll/DataConfig/aaa.xml

@@ -1,5 +1 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>-10</ShowDelayDays><TableInfoMode>0</TableInfoMode><ShowLogDays>-10</ShowLogDays><YQName>aaa</YQName></SystemFormatConfig>
-=======
-<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>0</ShowDelayDays><TableInfoMode>0</TableInfoMode><ShowLogDays>0</ShowLogDays><YQName>aaa</YQName></SystemFormatConfig>
->>>>>>> e61dd2ce015f609324a2df3f403e999bf1c3591b
+<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>0</ShowDelayDays><TableInfoMode>0</TableInfoMode><ShowLogDays>0</ShowLogDays><YQName>aaa</YQName></SystemFormatConfig>

dll/DataConfig/bbb.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>0</ShowDelayDays><TableInfoMode>1</TableInfoMode><ShowLogDays>0</ShowLogDays><YQName>bbb</YQName></SystemFormatConfig>

dll/DataConfig/fff.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>0</ShowDelayDays><TableInfoMode>1</TableInfoMode><ShowLogDays>0</ShowLogDays><YQName>fff</YQName></SystemFormatConfig>

dll/activation.config

@@ -1 +1 @@
-BFEBFBFF000B06A2_7413EA0CEB72_7613EA0CEB71_7413EA0CEB71
+BFEBFBFF000A0652_B025AA3FD303_00FF7AB4C9BA_8C554AD3D7A5_8E554AD3D7A4_8C554AD3D7A4_8C554AD3D7A8