replaced front door rubble with rotary destruction

millertime-homework / Emergency-Response

Emergency Response Game

0 stars 2 forks source link

replaced front door rubble with rotary destruction #39

Closed moralismercatus closed 11 years ago

moralismercatus commented 11 years ago

Removed associated js and image

millertime-homework commented 11 years ago

I'm really excited to see this...

millertime-homework commented 11 years ago

It looks like you have conflicts with the master branch. You need to go to your 4/front-door-destruction branch and do: 'git rebase origin/master' or 'git merge master' and resolve any conflicts that pop up. Then do 'git push origin 4/front-door-destruction'. If you chose to rebase instead of merge, you will need to push with the '-f' option.