diff options
author | Carl Suster <carl@contraflo.ws> | 2014-04-24 12:49:55 +1000 |
---|---|---|
committer | Carl Suster <carl@contraflo.ws> | 2014-04-24 12:49:55 +1000 |
commit | b412c0164a1bccdc295964dc8564f68637ae33c8 (patch) | |
tree | 1a6b67211ee28c073388fdf0c4a603255d12de40 | |
parent | 95d8ff4e7aedb5a1742fe1f70ea8f33f267adf42 (diff) | |
parent | 5eacf05adb5a1c6efe7205b766953c537bbab064 (diff) | |
download | gitignore-b412c0164a1bccdc295964dc8564f68637ae33c8.tar.gz gitignore-b412c0164a1bccdc295964dc8564f68637ae33c8.zip |
Merge pull request #1055 from PR3x/master
Fix EOL issues in multiple gitignores
-rw-r--r-- | Android.gitignore | 2 | ||||
-rw-r--r-- | CodeIgniter.gitignore | 2 | ||||
-rw-r--r-- | Composer.gitignore | 2 | ||||
-rw-r--r-- | Symfony2.gitignore | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Android.gitignore b/Android.gitignore index 6b6f0a93..3a36c6e7 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -23,4 +23,4 @@ local.properties proguard/ #Log Files -*.log
\ No newline at end of file +*.log diff --git a/CodeIgniter.gitignore b/CodeIgniter.gitignore index ca0e37ee..846b8c54 100644 --- a/CodeIgniter.gitignore +++ b/CodeIgniter.gitignore @@ -3,4 +3,4 @@ */logs/!index.html */cache/* */cache/!index.html -*/cache/!.htaccess
\ No newline at end of file +*/cache/!.htaccess diff --git a/Composer.gitignore b/Composer.gitignore index aa5997f4..3a693c92 100644 --- 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
\ No newline at end of file +# composer.lock diff --git a/Symfony2.gitignore b/Symfony2.gitignore index f4a95cb4..f5465e10 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -13,4 +13,4 @@ app/config/parameters.ini app/config/parameters.yml # Composer -composer.phar
\ No newline at end of file +composer.phar |