Skip to content
Jump to bottom

made conflict file #1

Merged
merged 1 commit into from
Jun 1, 2026
+2 −0
Merged

made conflict file #1

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Conflict.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
hello!
Im a conflict