Skip to content

Fix CI#320

Merged
michaeljoseph merged 4 commits intocookiecutter:masterfrom
michaeljoseph:fix-ci
Nov 12, 2014
Merged

Fix CI#320
michaeljoseph merged 4 commits intocookiecutter:masterfrom
michaeljoseph:fix-ci

Conversation

@michaeljoseph
Copy link
Copy Markdown
Contributor

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage remained the same when pulling f90d1c6 on michaeljoseph:fix-ci into 2d12bd4 on audreyr:master.

@ramiroluz
Copy link
Copy Markdown
Contributor

I did a commit that fix the flake8 configuration, but I did not removed the unicode tests. What is the best action here?
1 - Revert my commit, fix your tox.ini for this pull request, or
2 - Remove the unicode test in my branch.

@michaeljoseph
Copy link
Copy Markdown
Contributor Author

@ramiroluz This branch contains the same tox.ini fix: f90d1c6

@ramiroluz
Copy link
Copy Markdown
Contributor

@michaeljoseph Ok, I see. I believe I have to merge your branch with mine to fix everything.

@michaeljoseph michaeljoseph merged commit f90d1c6 into cookiecutter:master Nov 12, 2014
@michaeljoseph michaeljoseph deleted the fix-ci branch November 12, 2014 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