ngauthier/merge conflict fail

Created August 11, 2010 19:50

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

Select an option

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

Download ZIP

Raw

merge conflict fail

	<<<<<<< HEAD

	=======
	>>>>>>> sector-size

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