Skip to content
Snippets Groups Projects
Commit 77c70973 authored by Jerry Huang's avatar Jerry Huang
Browse files

Resolved merge conflict in README.md

parents 64fca7cc f9f3a9ee
Branches
No related tags found
No related merge requests found
# Git Laboratory
This is a feature branch.
This will also cause a conflict.
This is a feature branch.
Conflict resolved.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment