Skip to content

CPULIDOC merge first #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cpulidoc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CPULIDOC merge first #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test-merge-conflict.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ This is a sample file created to practice resolving merge conflicts.
10. Go through steps mentioned above to resolve the merge conflict.

## Sample Content
Hello, today is <DATE>.
This is line 2, by <USERNAME>.
I live in <CITY>, <COUNTRY>.
Hello, today is Jan 9.
This is line 2, by Cristhian Pulido.
I live in Bogotown, Colombia.