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

Resolved merge conflict in README.md

parents 7ac44906 ec976bc6
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
README.md
+ 4
− 0
View file @ 213d1b12
# Git Laboratory
some changes
<<<<<<< HEAD
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