diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 18a2e808d..7ca89dca8 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -14,7 +14,11 @@ uploads | |||
| 14 | thumbnails | 14 | thumbnails |
| 15 | config/production.yaml | 15 | config/production.yaml |
| 16 | ffmpeg | 16 | ffmpeg |
| 17 | <<<<<<< HEAD | ||
| 18 | torrents | ||
| 19 | ======= | ||
| 17 | .tags | 20 | .tags |
| 18 | *.sublime-project | 21 | *.sublime-project |
| 19 | *.sublime-workspace | 22 | *.sublime-workspace |
| 20 | torrents/ | 23 | torrents/ |
| 24 | >>>>>>> master | ||