mirror of
https://github.com/octocat/Hello-World.git
synced 2026-06-07 04:57:49 +00:00
Resolved merge conflict
This commit is contained in:
commit
158b402a1e
1 changed files with 4 additions and 1 deletions
5
README
5
README
|
|
@ -1,2 +1,5 @@
|
|||
Hello World!
|
||||
This line is added from feature-update branch.
|
||||
|
||||
This line is added from feature-update branch.
|
||||
Main branch updated content
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue