diff --git a/conflict.txt b/conflict.txt index 26ddf3d..c21e344 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,3 +1,9 @@ git is very useful. please keep your line here: + + + + + +git is confusing.... where's sccs?