speechkey/gist:2510037

Created April 27, 2012 15:11

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/speechkey/2510037.js"></script>
Save speechkey/2510037 to your computer and use it in GitHub Desktop.

Download ZIP

Merge git conflict with Sublime Text 2

Raw

gistfile1.txt

	Find what: \n<<<<<<< HEAD((.\n)?)=======(.\n)?>>>>>>>.*\n
	Replace with: \1

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