mirror of
https://github.com/friendica/friendica
synced 2024-12-22 23:20:16 +00:00
Fixes for composer:
- ./vendor/ is being prepared by executing `utils/composer.phar install`, no need to have it around - converted .gitignore to LF line-ending (more common over the whole project) - no need to have them around ... Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
parent
2fd14eac70
commit
cdc24a73ca
1 changed files with 3 additions and 0 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -56,6 +56,7 @@ venv/
|
||||||
|
|
||||||
#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
|
#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
|
||||||
vendor/*
|
vendor/*
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
#ignore config files from JetBrains
|
#ignore config files from JetBrains
|
||||||
/.idea
|
/.idea
|
||||||
|
@ -65,3 +66,5 @@ addons/
|
||||||
|
|
||||||
#Ignore .htaccess as it may contain local changes
|
#Ignore .htaccess as it may contain local changes
|
||||||
.htaccess
|
.htaccess
|
||||||
|
=======
|
||||||
|
>>>>>>> Fixes for composer:
|
||||||
|
|
Loading…
Reference in a new issue