Skip to content
Snippets Groups Projects
Commit e200686e authored by Edric Tang's avatar Edric Tang
Browse files

Change from another machine

parent 11112da9
Branches main
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
README.md
+ 1
− 0
View file @ e200686e
......@@ -5,3 +5,4 @@ This will also cause a conflict.
=======
This will cause a conflict.
>>>>>>> conflict-branch
Change from another machine
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment