diff --git a/conflict.txt b/conflict.txt index 6a82720..6d8157f 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,3 +1,3 @@ git is good at conflict resolution. -please keep your line here: +please keep your line here: the git of life!