New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Directory #62

Merged

JoeLametta merged 3 commits into whipper-team:master from RecursiveForest:directory

Nov 3, 2016

Contributor

RecursiveForest commented Nov 2, 2016

Merge after #61 , as this patch is based on that branch. (Not necessarily, but in order to avoid merge conflicts.)

RecursiveForest added 3 commits

November 2, 2016 16:36


          undelete overzealously removed plugin initialisation

b73048b


          tersify pkg_resources/directory calls since we don't care about errors

1e01765


          refactor morituri.common.directory to shed Directory() and bulk

bccba71

JoeLametta merged commit bccba71 into whipper-team:master

Collaborator

JoeLametta commented Nov 3, 2016

There was a merge conflict (morituri/rip/main.py).
I've merged the PR (hopefully in the right way).

RecursiveForest deleted the directory branch

November 8, 2016 05:15

# for free to join this conversation on GitHub. Already have an account? # to comment

Labels

None yet