Fix options not working properly

tldr-pages / tldr-python-client

:snake: Python command-line client for tldr pages 📚

https://pypi.org/project/tldr/

MIT License

599 stars 95 forks source link

Closed MasterOdin closed 6 years ago

MasterOdin commented 6 years ago

Closes #62.

felixonmars commented 6 years ago

Oops, I somehow missed this one. Please resolve the conflicts and I'll merge, thanks!

MasterOdin commented 6 years ago

Conflicts should have already been fixed?

felixonmars commented 6 years ago

2018-06-04-000113-8e3947 GitHub somehow still shows as conflict.

MasterOdin commented 6 years ago

Hard refresh your page? I merged master and fixed the merge conflict in 439ac04 in my fork.

screenshot 2018-06-03 12 05 16

felixonmars commented 6 years ago

The default rebase action didn't work, but squash works :)

Thanks again!