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

Resolved merge conflict in README.md

parents cc7be052 80ae274d
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
README.md
+ 4
− 0
View file @ 11112da9
# Git Laboratory # Git Laboratory
This is a feature branch. This is a feature branch.
<<<<<<< HEAD
This will also cause a conflict. This will also cause a conflict.
=======
This will cause a conflict.
>>>>>>> conflict-branch
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment