hiro/gitexample
1
0
Fork 0
mirror of https://github.com/vale981/gitexample synced 2025-03-04 17:11:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflict in README.md

Browse source
This commit is contained in:
Valentin Boettcher 2025-02-02 18:09:05 -05:00
commit 461c50f48a
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -2,3 +2,5 @@
This project solves world peace! This project solves world peace!
we changed this on main we changed this on main
a second new commit in main a second new commit in main
we changed this in feat

0
new_file.txt Normal file
View file