Skip to content

Conversation

@MasterOdin
Copy link
Contributor

@MasterOdin MasterOdin commented May 30, 2018

Closes #62.

@felixonmars
Copy link
Collaborator

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

@MasterOdin
Copy link
Contributor Author

Conflicts should have already been fixed?

@felixonmars
Copy link
Collaborator

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

@MasterOdin
Copy link
Contributor Author

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 felixonmars merged commit 703ff93 into tldr-pages:master Jun 3, 2018
@felixonmars
Copy link
Collaborator

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

Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants