diff options
| -rw-r--r-- | .gitignore | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 7ca89dca8..9255e85df 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -1,24 +1,16 @@ | |||
| 1 | node_modules | 1 | node_modules/ |
| 2 | schemes/ | ||
| 3 | certs/ | ||
| 4 | logs/ | ||
| 5 | test1/ | 2 | test1/ |
| 6 | test2/ | 3 | test2/ |
| 7 | test3/ | 4 | test3/ |
| 8 | test4/ | 5 | test4/ |
| 9 | test5/ | 6 | test5/ |
| 10 | test6/ | 7 | test6/ |
| 11 | public/stylesheets/global.css | 8 | uploads/ |
| 12 | public/stylesheets/vendor | 9 | thumbnails/ |
| 13 | uploads | 10 | certs/ |
| 14 | thumbnails | 11 | logs/ |
| 12 | torrents/ | ||
| 15 | config/production.yaml | 13 | config/production.yaml |
| 16 | ffmpeg | 14 | ffmpeg/ |
| 17 | <<<<<<< HEAD | ||
| 18 | torrents | ||
| 19 | ======= | ||
| 20 | .tags | ||
| 21 | *.sublime-project | 15 | *.sublime-project |
| 22 | *.sublime-workspace | 16 | *.sublime-workspace |
| 23 | torrents/ | ||
| 24 | >>>>>>> master | ||