Skip to content

Commit

Permalink
I've seen the conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
MuggleJ committed Sep 7, 2023
2 parents d2a31c8 + c4c2efb commit 01717ac
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# stater
It's a Test to learn how to use git .
<<<<<<< HEAD
Let me try to make some changed.

test git fetch. Now, I'm going to merge it.
=======
let me try to use git fetch.
this is a test to test fetch.

0 comments on commit 01717ac

Please sign in to comment.