fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

 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);