X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=28dec58f3ded7da845dd17bd11367c09b44bb655;hb=c70e0710b39b45e1b8b2d043e3d94f59df16b8a8;hp=7ca89dca8532625749c8e09c466040913187a17b;hpb=aff36eb063573532498979c83be1c279c84f2d53;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.gitignore b/.gitignore
index 7ca89dca8..28dec58f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,18 @@
-node_modules
-schemes/
-certs/
-logs/
-test1/
-test2/
-test3/
-test4/
-test5/
-test6/
-public/stylesheets/global.css
-public/stylesheets/vendor
-uploads
-thumbnails
-config/production.yaml
-ffmpeg
-<<<<<<< HEAD
-torrents
-=======
-.tags
-*.sublime-project
-*.sublime-workspace
-torrents/
->>>>>>> master
+/node_modules/
+/test1/
+/test2/
+/test3/
+/test4/
+/test5/
+/test6/
+/uploads/
+/videos/
+/thumbnails/
+/previews/
+/certs/
+/logs/
+/torrents/
+/config/production.yaml
+/ffmpeg/
+/*.sublime-project
+/*.sublime-workspace