Skip to content
Snippets Groups Projects
Commit f16996dc authored by Bryant Lin's avatar Bryant Lin
Browse files

Change from another machine

parent f5f9e7b1
No related branches found
No related tags found
1 merge request!1Remote branch
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
README.md
+ 1
− 0
View file @ f16996dc
......@@ -7,3 +7,4 @@ This will cause a conflict.
>>>>>>> conflict-branch
Staged change
Remote branch change
Change from another machine
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment