Merge pull request #1055 from PR3x/master

Fix EOL issues in multiple gitignores
2024-12-23 13:20:17 +01:00 · 2014-04-24 12:49:55 +10:00 · 2014-04-24 12:49:55 +10:00 · b412c0164a
commit b412c0164a
parent 95d8ff4e7a 5eacf05adb
4 changed files with 4 additions and 4 deletions
--- a/Android.gitignore
+++ b/Android.gitignore
@ -23,4 +23,4 @@ local.properties
 proguard/

 #Log Files
-*.log
+*.log
--- a/CodeIgniter.gitignore
+++ b/CodeIgniter.gitignore
@ -3,4 +3,4 @@
 */logs/!index.html
 */cache/*
 */cache/!index.html
-*/cache/!.htaccess
+*/cache/!.htaccess
--- a/Composer.gitignore
+++ b/Composer.gitignore
@ -3,4 +3,4 @@ vendor/

 # 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
-# composer.lock
+# composer.lock
--- a/Symfony2.gitignore
+++ b/Symfony2.gitignore
@ -13,4 +13,4 @@ app/config/parameters.ini
 app/config/parameters.yml

 # Composer
-composer.phar
+composer.phar