Skip to content

Conversation

pepa65
Copy link
Contributor

@pepa65 pepa65 commented Feb 7, 2017

Once the bpkg install actually works, I will submit it as the recommended way to install at the tldr pages project: http://tldr-pages.github.io/

@jwerle
Copy link
Member

jwerle commented Feb 7, 2017

@pepa65 can you resolve the conflicts so we can merge this PR?

@pepa65
Copy link
Contributor Author

pepa65 commented Feb 8, 2017

I don't understand why this happens. I did fetch before pushing, but maybe I forgot to pull?

@jwerle jwerle merged commit 70acfad into bpkg:master Feb 8, 2017
@pepa65
Copy link
Contributor Author

pepa65 commented Feb 8, 2017

OK, sorry, I see now this is on branch master. This should be on branch tldr-bash-client
Locally I fixed this, and put the latest version on that branch. I've tried resetting the master branch, but it doesn't seem to work...
I was going to submit a patch for the submit page, but I'll wait until things are cleared up.

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

Successfully merging this pull request may close these issues.

2 participants