diff options
| author | marwolaethblack <a.unal677@gmail.com> | 2017-11-30 12:52:21 +0100 |
|---|---|---|
| committer | marwolaethblack <a.unal677@gmail.com> | 2017-11-30 12:52:21 +0100 |
| commit | 1e5946aba89293d1a3103adb885bff4a69c6f769 (patch) | |
| tree | 18ef41b2b704aeff1127c7e36b36ab0e8928b328 /.gitignore | |
| parent | 373010be532616b89f4c3e9fef0a972f7cf539f5 (diff) | |
| parent | 1ccf8cd89e5d1d5b77a148009ad0060d8244dc8f (diff) | |
aaa
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 |