Skip to content
Snippets Groups Projects
Commit ccf55e94 authored by YanZongyao's avatar YanZongyao
Browse files

conflict solve

parent 70adb32c
No related branches found
No related tags found
No related merge requests found
...@@ -8,3 +8,4 @@ word word word ...@@ -8,3 +8,4 @@ word word word
* Web - Edit - 1111 * Web - Edit - 1111
* SSH - Edit - 2222 * SSH - Edit - 2222
* Web - Edit - 3333
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment