Skip to content

Instantly share code, notes, and snippets.

@matiasherranz
Created November 5, 2013 17:07
Show Gist options
  • Save matiasherranz/7322406 to your computer and use it in GitHub Desktop.
Save matiasherranz/7322406 to your computer and use it in GitHub Desktop.
git conflicts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment