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.

Sign up for GitHub

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

Jump to bottom

Push your changes to readme #9

Closed
pschmied opened this issue Oct 12, 2017 · 2 comments
Closed

Push your changes to readme #9

pschmied opened this issue Oct 12, 2017 · 2 comments
Assignees
@gricha2380

Comments

@pschmied
Copy link
Owner

No description provided.

@gricha2380
Copy link
Collaborator

Uh oh, auto merge failed due to conflict in README.md
I think some guy named "pschmied" is causing trouble.
https://cl.ly/1r3k171u2W0g

@pschmied pschmied mentioned this issue Oct 12, 2017
Closed
@gricha2380
Copy link
Collaborator

I took a look at git mergetool but I ultimately manually resolved it in Sublime.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@gricha2380 gricha2380

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@gricha2380 @pschmied