Skip to content

Images fix #77

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

Merged
merged 2 commits into from
Aug 21, 2017
Merged

Images fix #77

merged 2 commits into from
Aug 21, 2017

Conversation

ponsfrilus
Copy link
Contributor

@ponsfrilus ponsfrilus commented Aug 21, 2017

A better PR (no conflict) to fix image and close #73

@ponsfrilus ponsfrilus mentioned this pull request Aug 21, 2017
img/regexp.svg Outdated
@@ -17,7 +17,11 @@
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="regexp.svg"
<<<<<<< HEAD
Copy link
Owner

Choose a reason for hiding this comment

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

@ponsfrilus Could you please remove these conflict markers. :)

@ziishaned
Copy link
Owner

@ponsfrilus In regexp.svg you just forgot to remove the conflict markers could you please remove them.

@ziishaned ziishaned merged commit 4726270 into ziishaned:master Aug 21, 2017
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.

2 participants