From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 28 May 2016 19:10:29 +0000 (+0800)
Subject: Merge pull request #9621 from venth/feature/ignored_intellij
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=6d138e98e3c3f0ec952ba2b29fb4aa59e4bc2be9;hp=2bee7b25f39471c1ac5641b714e003bcf8335d15

Merge pull request #9621 from venth/feature/ignored_intellij

ignored intellij related files
---

diff --git a/.gitignore b/.gitignore
index d13551274..a802c75a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,9 @@ test/testdata
 test/local_parameters.json
 .tox
 youtube-dl.zsh
+
+# IntelliJ related files
 .idea
-.idea/*
+*.iml
+
 tmp/