Skip to content

Commit a6e5534

Browse files
smlsunxiesmlsunxie
committed
Conflicts: test.md
2 parents 8d02280 + fa24fbf commit a6e5534

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

‎docker-test-md‎

Whitespace-only changes.

‎test.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1+
<<<<<<< HEAD
12
test hello guys!
3+
=======
4+
test hello
5+
test jira DEMO-1 test
6+
>>>>>>> fa24fbf3999e30bd79693c984e8286b9981f6623

0 commit comments

Comments
 (0)