diff --git a/conflict.txt b/conflict.txt index 6a82720..bb1346c 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,3 +1,3 @@ -git is good at conflict resolution. +git is somewhat efficient at conflict resolution. please keep your line here: