From 6fa60de2b0d0237054aa7571191df0f291838031 Mon Sep 17 00:00:00 2001
From: QuakeGod <quakegod@sina.com>
Date: 星期五, 20 十月 2023 22:27:53 +0800
Subject: [PATCH] fix conflict
---
MTerm1/MTerm1Doc.cpp | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/MTerm1/MTerm1Doc.cpp b/MTerm1/MTerm1Doc.cpp
index 856ca5b..67b10c9 100644
--- a/MTerm1/MTerm1Doc.cpp
+++ b/MTerm1/MTerm1Doc.cpp
@@ -51,6 +51,8 @@
{KLCoilTypeSR,"SR"},
{KLCoilTypeC,"C"},
{KLCoilTypeT,"T"},
+ {KLCoilTypeP,"P"},
+ {KLCoilTypeE,"E"},
};
int CMTerm1Doc::nCoilTypeDefCount = sizeof(CMTerm1Doc::CoilTypeNameDef) / sizeof(stTypeNameDef);
--
Gitblit v1.9.1