sharpetronics/flarum
1
0
Fork 0
mirror of https://github.com/flarum/flarum.git synced 2025-11-05 00:00:54 -05:00
Code Issues Projects Releases Wiki Activity

Prevent Git from auto-merging Composer's lockfile

Browse Source 
Source: https://blog.martinhujer.cz/17-tips-for-using-composer-efficiently/
This commit is contained in:
Franz Liedke 2018-06-02 15:06:48 +02:00
parent 01e5fde09c
commit 995a2621db
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1,3 +1,5 @@
.gitattributes export-ignore .gitattributes export-ignore
.gitignore export-ignore .gitignore export-ignore
.gitmodules export-ignore .gitmodules export-ignore
composer.lock -merge