Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

pep8 cleanup in main.py #789

Merged
merged 4 commits into from
Dec 16, 2013
Merged

pep8 cleanup in main.py #789

merged 4 commits into from
Dec 16, 2013

Conversation

wpoely86
Copy link
Member

main.py is now pep8 friendly!

@hpcugentbot
Copy link
Contributor

Automatic reply from Jenkins: Can I test this?

@boegel
Copy link
Member

boegel commented Dec 14, 2013

@wpoely86: This is utterly broken after merging #781 and #695...

You could try and merge develop into your branch and resolve the conflicts, but I'm afraid there might be quite a bit of conflicts to deal with... If that's the case, maybe redo the work on top of develop and open up a new PR?

@wpoely86
Copy link
Member Author

I've forced pushed on this a branch a rebase of this commit on the latest develop HEAD.

@boegel
Copy link
Member

boegel commented Dec 16, 2013

Jenkins: ok to test

@boegel
Copy link
Member

boegel commented Dec 16, 2013

@wpoely86: Looks great, let's get wpoely86#8 included too.

@wpoely86
Copy link
Member Author

Merged wpoely86#8

@boegel
Copy link
Member

boegel commented Dec 16, 2013

Good to go, thanks @wpoely86 for the cleanup + bug fix!

boegel added a commit that referenced this pull request Dec 16, 2013
@boegel boegel merged commit aac608e into easybuilders:develop Dec 16, 2013
@wpoely86 wpoely86 deleted the pep8-clean branch December 17, 2013 08:53
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.

3 participants