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

Add flit to the key projects list #358

Merged
merged 2 commits into from Jul 29, 2017
Merged

Add flit to the key projects list #358

merged 2 commits into from Jul 29, 2017

Conversation

theacodes
Copy link
Member

@theacodes theacodes commented Jul 28, 2017

Resolves #336

@theacodes theacodes requested a review from ncoghlan Jul 28, 2017
@ncoghlan
Copy link
Member

ncoghlan commented Jul 29, 2017

@jonparrott Hmm, my attempt to resolve the merge conflict through the web UI appears to have confused GitHub, even though Travis is happy with the result :P

@ncoghlan ncoghlan merged commit 62a3d0a into pypa:master Jul 29, 2017
1 check passed
@ncoghlan
Copy link
Member

ncoghlan commented Jul 29, 2017

@jonparrott Ah, never mind, just needed to switch the merge strategy to Squash & Merge.

So, similar to the enscons entry, I figure if @takluyver would like any amendments, we can tackle those in a separate PR.

@takluyver
Copy link
Member

takluyver commented Jul 29, 2017

Thanks both! This looks good to me. :-)

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.

None yet

3 participants