Browse Source

Merge branch 'bob'

- Use both versions.
testuser1 2 years ago
parent
commit
72406fcc89
1 changed files with 2 additions and 0 deletions
  1. 2 0
      bob.txt

+ 2 - 0
bob.txt

@@ -8,3 +8,5 @@ Do merge:
 $ git merge FROM
 
 Beware of conflicts! :)
+
+Fear the merge!