Skip to content
This repository has been archived by the owner on May 5, 2023. It is now read-only.

add support for 7zip #132

Merged
merged 1 commit into from
Mar 28, 2018
Merged

add support for 7zip #132

merged 1 commit into from
Mar 28, 2018

Conversation

FunFR
Copy link

@FunFR FunFR commented Jan 4, 2017

No description provided.

@bastelfreak
Copy link
Member

Hi @FunFR, thanks for the PR. Can you please take a look at the used email addr? It isn't associated with your github profile.

@bastelfreak
Copy link
Member

Hi @FunFR, is it possible that you review the git history? It looks a bit wrong. If you need help with git, feel free to join our IRC channel #voxpupuli on freenode, we are happy to help out.

@ekohl
Copy link
Member

ekohl commented Dec 18, 2017

Could you rebase this? If needed we can help.

@FunFR
Copy link
Author

FunFR commented Dec 19, 2017

done ... Sorry for the delay :)

@ekohl
Copy link
Member

ekohl commented Dec 19, 2017

No problem, sometimes life distracts you. Thanks for rebasing. Could you address the rubocop failure? Then I can merge it and include it in the release I want to make.

@ekohl
Copy link
Member

ekohl commented Dec 19, 2017

Didn't you just add a second commit that fixed rubocop? I don't see it anymore.

@FunFR
Copy link
Author

FunFR commented Dec 19, 2017

squash with rubocop patch

@ekohl
Copy link
Member

ekohl commented Dec 19, 2017

Awesome, thanks!

@bastelfreak
Copy link
Member

@FunFR please check the used email address in the commit, it isn't associated with your github account.

@ekohl
Copy link
Member

ekohl commented Dec 19, 2017

Merging the tar PR also introduced a merge conflict.

@ekohl
Copy link
Member

ekohl commented Dec 19, 2017

Looks like that didn't work. Did you pull in the latest master?

@bastelfreak bastelfreak added enhancement New feature or request and removed needs-rebase labels Mar 28, 2018
@bastelfreak
Copy link
Member

Thanks for the rebase @FunFR !

@bastelfreak
Copy link
Member

rebased it again

@bastelfreak bastelfreak merged commit 98ec08d into voxpupuli:master Mar 28, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants