From d10b6da53e70dda0f0d22babc6bd157e5b1d924e Mon Sep 17 00:00:00 2001
From: Gyusung Nam <scott9601@ajou.ac.kr>
Date: Tue, 3 May 2022 23:29:39 +0900
Subject: [PATCH] edited in ssh

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 56d69b6..2166dae 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,5 @@ test-project - I edited at Web
 * 1300 PC에서 합침
 * 1313 pc에서 또 고침
 * 1311 web에서 또 고쳤어요
-<<<<<<< HEAD
 * 05032324 pc에서 고쳐봄
-=======
 * 05031121 연습용
->>>>>>> 60145f90f823d1152b10acd598fc37e85d73ea19
-- 
GitLab