Skip to content

Commit

Permalink
Created Conflict on Conflict Branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@NormTurtle
NormTurtle committed Jan 4, 2024
1 parent c63031c commit e67b5d6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contributors/Normturtle/Conflict.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
line changed by Thrid-branch
line changed For Conflict
line 2 for conflict

0 comments on commit e67b5d6

Please sign in to comment.