search

fossasia / flappy-svg

Flappy Bird in SVG. Play it at http://fossasia.github.io/flappy-svg/
Other
1.61k stars 157 forks source link

Fixed an issue with the new layer #238

Closed manastaneja closed 7 years ago

niccokunzmann commented 7 years ago

Hi, I would like to merge it but somebody already edited the file. Are you able to make the changes, so it can be merged?

abishekvashok commented 7 years ago

@manastaneja pls resolve the conflicts bro please update and resolve the conflicts we can assist you if you are not able to resolve the conflicts we can't resolve them as github states it's too complex to fix.

manastaneja commented 7 years ago

@Abhi2424shek Please check your mail. I have some queries :)

abishekvashok commented 7 years ago

Yikes my mail? @manastaneja pls wait.... next time pls don't mail just ping on slack.

abishekvashok commented 7 years ago

As you requested closing this...