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

Updated conflict.svg to match the other graphics #245

Merged
merged 1 commit into from
Mar 6, 2016

Conversation

daisieh
Copy link
Contributor

@daisieh daisieh commented Mar 1, 2016

It's been many many moons since I agreed to do this in #141, but here it is at last.

@iglpdc
Copy link
Contributor

iglpdc commented Mar 6, 2016

Thanks @daisieh!

iglpdc added a commit that referenced this pull request Mar 6, 2016
Updated conflict.svg to match the other graphics
@iglpdc iglpdc merged commit 2e123cf into swcarpentry:gh-pages Mar 6, 2016
@daisieh daisieh deleted the new-conflict-graphic branch March 7, 2016 06:28
zkamvar pushed a commit that referenced this pull request May 8, 2023
Updated conflict.svg to match the other graphics
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

2 participants