added new file testfile1
Merge branch 'master' of https://github.com/githubteacher/poetry
Merge branch 'master' of https://github.com/githubteacher/poetry
One Fish Two Fish
Merge branch 'master' of https://github.com/githubteacher/poetry
Twas brillig
Added silly poem
Frumious bandersnatch
transformersgit add .
hoping merge conflict
added itsMe.txt
Add new file
Merge branch 'master' of https://github.com/githubteacher/poetry
added itsMe.txt
Merge branch 'master' of https://github.com/githubteacher/poetry
toro
Merge commit 'refs/pull/18/head' of https://github.com/githubteacher/poetry
Merge branch 'master' of https://github.com/githubteacher/poetry
modify newfile.txt
for sure