From 10e1d6f14c99364d44074a340c9286c348f8264d Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 7 Aug 2025 02:32:08 +0000
Subject: [PATCH] Resolve merge conflict and fix typo in test files

Co-authored-by: jiihwan.kim <jiihwan.kim@gmail.com>
---
 TEST.txt | 4 ----
 dd.txt   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/TEST.txt b/TEST.txt
index 93a3bb1..360db59 100644
--- a/TEST.txt
+++ b/TEST.txt
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 New test123
-=======
-New test
 
 In v2
->>>>>>> v2
diff --git a/dd.txt b/dd.txt
index 73c1790..30d74d2 100644
--- a/dd.txt
+++ b/dd.txt
@@ -1 +1 @@
-tset
\ No newline at end of file
+test
\ No newline at end of file