diff options
| author | marcinzelent <zelent.marcin@gmail.com> | 2017-11-30 12:58:21 +0100 |
|---|---|---|
| committer | marcinzelent <zelent.marcin@gmail.com> | 2017-11-30 12:58:21 +0100 |
| commit | 4246f15d64d9ec460b3cb5acc2e838978bc2c91c (patch) | |
| tree | 1a7087c1870dff4dedd57b4e893a710785cebe32 /.gitignore | |
| parent | 1a572a61f0bc6fe58a7270fca57a4b97066eeac2 (diff) | |
| parent | 1e5946aba89293d1a3103adb885bff4a69c6f769 (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -15,4 +15,8 @@ !var/SymfonyRequirements.php /vendor/ /web/bundles/ +<<<<<<< HEAD +.idea +======= /.idea/ +>>>>>>> 72114be2d32b090f68996acb87cef7fde748b534 |