Merge conflicts

This commit is contained in:
s452490 2020-01-20 14:29:58 +01:00
commit a7ed68961f

View File

@ -4,6 +4,6 @@ violets are blue...
I am amazing,
and so are you!
Git is easy to learn,
Git is ez to learn,
but hard to master,
so git gud kid!
so git gud kid.