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

Merge branch 'remote-branch' into 'master' 

Remote branch

See merge request !1
parents 213d1b12 be599ad1
Branches
No related tags found
1 merge request!1Remote branch
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
README.md
+ 4
− 0
View file @ c070b611
...@@ -5,3 +5,7 @@ This will also cause a conflict. ...@@ -5,3 +5,7 @@ This will also cause a conflict.
======= =======
This will cause a conflict. This will cause a conflict.
>>>>>>> conflict-branch >>>>>>> conflict-branch
Staged change
Remote branch change
Change from another machine
Remote branch change
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment