Skip to content
Snippets Groups Projects
Commit 7c4c21d0 authored by parkjiyoung's avatar parkjiyoung
Browse files

Solve Conflict

parents 1b25f2dc 8fc2d670
No related branches found
No related tags found
No related merge requests found
......@@ -12,4 +12,5 @@
88888 - Web 10:10
99999 - Web 10:11
00000 - SSH 09:12
00000 - Web
```
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment