From 867412193d24777aed9ae7a26ac8523505b00473 Mon Sep 17 00:00:00 2001
From: CJY <everymomentisu@gmail.com>
Date: Tue, 23 Dec 2025 09:32:49 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?=
 =?UTF-8?q?=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 INT69DB_2A/Forms/FormMain.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs
index c826cf7..96f4401 100644
--- a/INT69DB_2A/Forms/FormMain.cs
+++ b/INT69DB_2A/Forms/FormMain.cs
@@ -43,13 +43,10 @@ namespace INT69DB_2A.Forms
         public string ComPortMainToLCD; // DllSerial Port
         public bool FlagDllSerial;      // DllSerial 사용여부
         private string TransferNum;     // 수신데이터 ID저장 (재전송 시 사용)
-<<<<<<< HEAD
         public bool FlagThreadMessage1;     // 플레그 쓰레드 메시지 11
         public int TotalAllCount; // 스틱1 전체 수량
         public int TotalPassCount; // 스틱1 전체 Pass 수량
         public int TotalNGCount; // 스틱1 전체 NG 수량
-=======
->>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제)
 
         // Motor Download 통신용 변수
         public int LineNum;
@@ -447,13 +444,10 @@ namespace INT69DB_2A.Forms
             this.ColorLogOff = Color.Red;
             this.ColorLogOn = Color.Yellow;
             this.TransferNum = "-";
-<<<<<<< HEAD
             this.FlagThreadMessage1 = false;
             this.TotalAllCount = 0;
             this.TotalNGCount = 0;
             this.TotalPassCount = 0;
-=======
->>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제)
 
             this.PathLaunchFolder = "SD Card\\";
             this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\";
@@ -1520,7 +1514,6 @@ namespace INT69DB_2A.Forms
             return sb.ToString();
         }
 
-<<<<<<< HEAD
         public string Protocol_OPT5(Collection<WeightData> datas)
         {
             string value = "";
@@ -1704,8 +1697,6 @@ namespace INT69DB_2A.Forms
             return sb.ToString();
         }
 
-=======
->>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제)
         public byte[] Protocol_Modbus_Client_Write_Common_Data()
         {
             int index = 0;