1
0
mirror of https://github.com/github/gitignore synced 2024-12-23 13:20:17 +01:00

Merge pull request #1055 from PR3x/master

Fix EOL issues in multiple gitignores
This commit is contained in:
Carl Suster 2014-04-24 12:49:55 +10:00
commit b412c0164a
4 changed files with 4 additions and 4 deletions

View File

@ -23,4 +23,4 @@ local.properties
proguard/ proguard/
#Log Files #Log Files
*.log *.log

View File

@ -3,4 +3,4 @@
*/logs/!index.html */logs/!index.html
*/cache/* */cache/*
*/cache/!index.html */cache/!index.html
*/cache/!.htaccess */cache/!.htaccess

View File

@ -3,4 +3,4 @@ vendor/
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock # composer.lock

View File

@ -13,4 +13,4 @@ app/config/parameters.ini
app/config/parameters.yml app/config/parameters.yml
# Composer # Composer
composer.phar composer.phar