search

sindresorhus / awesome-scifi

Sci-Fi worth consuming
Creative Commons Zero v1.0 Universal
4.23k stars 257 forks source link

Merge pull request #2 from sindresorhus/master #184

Closed peadalmeida closed 8 years ago

peadalmeida commented 8 years ago

Update from original

peadalmeida commented 8 years ago

This is insane. How can I merge without a file change? :sweat_smile:

RichardLitt commented 8 years ago

Whatever you're doing... maybe stop? :P Or tell us what you are trying to do here.

Do you know how to use the command line?

peadalmeida commented 8 years ago

Yes, I know. Just trying to figure out why this is happening when I try to sync the fork with the original repo. I'll stop now :+1: