Last active
April 12, 2019 06:24
-
-
Save VasekPurchart/44ba438c50f872a9c535 to your computer and use it in GitHub Desktop.
composer.lock - disable auto-merging (http://git-scm.com/docs/gitattributes#_performing_a_three_way_merge) #composer #lock #git #merge
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/composer.lock -merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment