diff options
| author |  Sebastiaan Zeeff <[email protected]> | 2019-10-15 15:54:20 +0200 |
|---|---|---|
| committer | Sebastiaan Zeeff <[email protected]> | 2019-10-15 15:54:20 +0200 |
| commit | f32341de7df58899e63cf1e885cfdf1b425c1195 (patch) | |
| tree | 22bdc38866a1fc42f6e017b2bb4b2df88ea99a2b /.gitignore | |
| parent | Remove empty tests.cogs folder (diff) | |
| parent | Create the !mention command. (#493) (diff) | |
Merge branch 'master' into unittest-migration
Resolving merge conflicts from master in `.gitignore` and
`tests/helpers.py`.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 210847759..fb3156ab1 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,6 @@ config.yml # xmlrunner unittest XML reports TEST-**.xml + +# Mac OS .DS_Store, which is a file that stores custom attributes of its containing folder +.DS_Store |