mirror of
https://github.com/octocat/Hello-World.git
synced 2026-06-07 04:57:49 +00:00
Resolved merge conflict between master and feature branch
This commit is contained in:
commit
323560bcd6
1 changed files with 4 additions and 1 deletions
5
README
5
README
|
|
@ -1,2 +1,5 @@
|
|||
Hello World!
|
||||
This project demonstrates Git branching and conflict resolution using feature branches.
|
||||
|
||||
This project demonstrates Git branching and conflict resolution using feature branches.
|
||||
|
||||
This README was updated directly in the master branch.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue