Merge pull request #1 from sindresorhus/master

sindresorhus / awesome-scifi

Sci-Fi worth consuming

Creative Commons Zero v1.0 Universal

4.23k stars 257 forks source link

Merge pull request #1 from sindresorhus/master #179

Closed peadalmeida closed 8 years ago

peadalmeida commented 8 years ago

Close #178 PR: Add Star Trek: The Original Series.

RichardLitt commented 8 years ago

What the... I'm confused. What just happened? How can you merge without a file change?

peadalmeida commented 8 years ago

I don't understand. I just tried to sync my fork with the original, including the PR #178.

RichardLitt commented 8 years ago

That is super confusing. Do you have a history of your bash commands? I'd be interested in looking at them! This is weird! :dancers:

peadalmeida commented 8 years ago

Confusing indeed. I don't have a history of my bash commands because I merged directly from Github. And it's still saying that my fork is 1 commit ahead of the original repository :confused:

RichardLitt commented 8 years ago

That's weird.