Skip to content

Instantly share code, notes, and snippets.

@thumbot

thumbot/merge.txt Secret

Created February 21, 2017 21:24
Show Gist options
  • Save thumbot/86a7ac7aeb47e1af1e97c0208119f3f9 to your computer and use it in GitHub Desktop.
Save thumbot/86a7ac7aeb47e1af1e97c0208119f3f9 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
merge.txt
Auto-merging priv/default_schema.xml
Merge made by the 'recursive' strategy.
priv/default_schema.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment