Skip to content

Instantly share code, notes, and snippets.

@VasekPurchart

VasekPurchart/.gitattributes

Last active April 12, 2019 06:24
Show Gist options
  • Star 10 You must be signed in to star a gist
  • Fork 2 You must be signed in to fork a gist
  • Save VasekPurchart/44ba438c50f872a9c535 to your computer and use it in GitHub Desktop.
Save VasekPurchart/44ba438c50f872a9c535 to your computer and use it in GitHub Desktop.
Download ZIP
composer.lock - disable auto-merging (http://git-scm.com/docs/gitattributes#_performing_a_three_way_merge) #composer #lock #git #merge
Raw
.gitattributes
/composer.lock -merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment