diff options
| author | marcinzelent <zelent.marcin@gmail.com> | 2018-03-16 21:36:08 +0100 |
|---|---|---|
| committer | marcinzelent <zelent.marcin@gmail.com> | 2018-03-16 21:36:08 +0100 |
| commit | 9441b9d8b3035dc3142234dd13a1bcea21e72749 (patch) | |
| tree | 87feae2e1e3492c9f0f23a724bea43e18bfb0ce7 /.gitignore | |
| parent | 1ab2b90b02705e206680b5428bf1fbaec6438132 (diff) | |
| parent | 6335f35fe0516f16be10e29e9d0b960010067fe0 (diff) | |
Merge.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 16e54e2..0000000 --- a/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -/.web-server-pid -/app/config/parameters.yml -/build/ -/phpunit.xml -/var/* -!/var/cache -/var/cache/* -!var/cache/.gitkeep -!/var/logs -/var/logs/* -!var/logs/.gitkeep -!/var/sessions -/var/sessions/* -!var/sessions/.gitkeep -!var/SymfonyRequirements.php -/vendor/ -/web/bundles/ -<<<<<<< HEAD -.idea -======= -/.idea/ ->>>>>>> 72114be2d32b090f68996acb87cef7fde748b534 |