thumbot/merge.txt Secret

Created December 5, 2016 23:51

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/thumbot/b759bc9c17c173290edf7bc0a0fed279.js"></script>
Save thumbot/b759bc9c17c173290edf7bc0a0fed279 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

	Merge made by the 'recursive' strategy.
	app.rb \| 2 +-
	1 file changed, 1 insertion(+), 1 deletion(-)

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