Skip to content
Snippets Groups Projects
Commit 37170fbe authored by Gong Myungkyu's avatar Gong Myungkyu
Browse files

main+0510 merged

parents e17fcaf6 4d46837a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 7 deletions
README.md
+ 3
− 7
View file @ 37170fbe
...@@ -8,7 +8,7 @@ test-project - I edited in web ...@@ -8,7 +8,7 @@ test-project - I edited in web
* 1253 edit again * 1253 edit again
* 1258 web에서 수정 * 1258 web에서 수정
* PC에서 합침 * PC에서 합침
* Mike SSH - 05/06 12:40 --- * Mike SSH - 05/06 12:40 -----
## 2022년 5월 10일 ## 2022년 5월 10일
...@@ -16,10 +16,6 @@ test-project - I edited in web ...@@ -16,10 +16,6 @@ test-project - I edited in web
### I am in the branch 0510 *** ### I am in the branch 0510 ***
* Hello * Hello
* 0510 0510 0510
<<<<<<< HEAD <<<<<<< HEAD
* edit in 0510 * 0510 0510 0510
======= * MAIN MAIN MAIN
* edit from main
>>>>>>> main
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr