Skip to content

Kkomeng modify first#188

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
kkomeng wants to merge 6 commits into
base:master
Choose a base branch
from
Open

Kkomeng modify first #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfa46d6
A new file added.
kkomeng Sep 21, 2023
92eacbf
A new line was added in line 6.
kkomeng Sep 21, 2023
8908058
Update README.md
kkomeng Sep 21, 2023
aabb5f8
Merge pull request #1 from kkomeng/github-kkomeng-caption
kkomeng Sep 21, 2023
1d83248
added a single line
kkomeng Sep 21, 2023
31c1ca5
first mod to test merge conflict.
kkomeng Sep 21, 2023
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: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
# A scratch repo on GitHub.com


## Mojo

my caption
change made here to test merge conflict.
4 changes: 4 additions & 0 deletions my-file.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# my-file
This is my file that I've added.

a line is added to test a merge conflict.