Skip to content

Instantly share code, notes, and snippets.

@thumbot

thumbot/merge.txt Secret

Created February 15, 2017 22:55
Show Gist options
  • Save thumbot/c31f786b6f5091486315bd0c2297d1ea to your computer and use it in GitHub Desktop.
Save thumbot/c31f786b6f5091486315bd0c2297d1ea 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 | 12 ++++++++++++
1 file changed, 12 insertions(+)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment