Skip to content
Snippets Groups Projects
Commit d8435f16 authored by Sung Minsuk's avatar Sung Minsuk
Browse files

conflict 2 solve

parents f0995e05 b1319af4
No related branches found
No related tags found
No related merge requests found
......@@ -10,4 +10,5 @@ word
* Web Edit 1111
* SSH Edit 2222
* Web Edit 3333
* SSH Edit 4444 4444
* Web Edit 4444
* SSH Edit 5555
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment