冲突

XHPZ.Desktop/APP.cs

@@ -55,17 +55,13 @@ namespace XHPZ.Desktop
         /// <summary>
         /// 腾千里手写笔是否已连接
         /// </summary>
-<<<<<<< HEAD
-        public static PracticeWindow W_PracticeWindow = null;
-=======
         public static bool TQLPenStatus = false;
         #endregion
         #region 页面
         ///// <summary>
         ///// 批注
         ///// </summary>
-        //public static PracticeWindow W_PracticeWindow = null;
->>>>>>> a23bdc84b33a613a7ae65513fd285d36f24a5dd6
+        public static PracticeWindow W_PracticeWindow = null;
         #endregion
         #endregion