Skip to content

Conflicted fixed and created the first line of the second verse #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Icicleta wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Conflicted fixed and created the first line of the second verse #17

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb78a6f
added line 10
Feb 20, 2015
bad892c
conflict 'supper' line fixed line 10
Feb 20, 2015
697239c
started second verse, line 12
Feb 20, 2015
f40154f
fix conflict and add a line 9
Feb 20, 2015
a3218da
Conflict fixed and first line of second verse added
Feb 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion MakersSong.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ Makers, Makers, We're Movers & Shakers!

How to be twice as smart,
the bonus speeder-uppper

we can't understand a word,
fetch is giving an error all the time...
oops i did it again, git pushed and not merged
we don't to part
'cause we gotta eat supper.

We don't know what we're doing