Bosoko
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 7
− 6
@@ -15,16 +15,17 @@ This is a hands-on tutorial on how to learn git.
\ No newline at end of file