Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@NianHhhh
NianHhhh committed Jun 10, 2024
2 parents 037a9bc + a9c9e21 commit a0debd7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
# maizeiinfo
=======
# maizeiinfo.github.io
>>>>>>> origin/main
=======
# maizeiinfo.github.io
>>>>>>> origin/main

0 comments on commit a0debd7

Please sign in to comment.