Skip to content

Commit

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

0 comments on commit c63031c

Please sign in to comment.