From df707a0c33f006d33f24f3a3aa560047421fb86b Mon Sep 17 00:00:00 2001
From: kangkihoon <rlgns0370@gmail.com>
Date: Sun, 14 Aug 2022 23:46:06 +0900
Subject: [PATCH] test

---
 confilict.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/confilict.md b/confilict.md
index df5b9d2..a395378 100644
--- a/confilict.md
+++ b/confilict.md
@@ -1,4 +1,4 @@
 # 충돌~~
-이건 한문철도 못막는 충돌
+이건 한문철도 못막는 충돌인데 막았네
 
 박윤국 나도 이거 바꿀건데 ㅋㅋㅋ