diff --git a/contributors/Normturtle/Conflict.md b/contributors/Normturtle/Conflict.md index 1e2171d..57fabc7 100644 --- a/contributors/Normturtle/Conflict.md +++ b/contributors/Normturtle/Conflict.md @@ -1,2 +1,2 @@ -line changed by Thrid-branch +line changed For Conflict line 2 for conflict