diff --git a/conflict.txt b/conflict.txt index 26ddf3d..7603374 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,3 +1,4 @@ git is very useful. please keep your line here: +git ia not better than me at conflict resolution.