added a funny line - Githubissues

1egoman / funnies

:stuck_out_tongue_winking_eye: Make users laugh when your app loads.

https://1egoman.github.io/funnies/

MIT License

178 stars 54 forks source link

added a funny line #59

Closed tiffanywilson closed 7 years ago

1egoman commented 7 years ago

@tiffanywilson Could you fix the merge conflict? Thanks for adding a funny line!

tiffanywilson commented 7 years ago

@1egoman resolved

1egoman commented 7 years ago

@tiffanywilson I'm really sorry, but I think I caused another conflict. If you'd be willing to fix it again I'll make sure to merge yours in first next time as to not cause any more trouble.

Thanks!

tiffanywilson commented 7 years ago

@1egoman no worries! fixed again

1egoman commented 7 years ago

Thanks! 😄