From 85a512a7ee97e7f2dc32a90c4a85a4c151083849 Mon Sep 17 00:00:00 2001
From: Ivan Yatskevich <ivan@yatskevich.com>
Date: Wed, 25 Sep 2013 12:04:55 +0300
Subject: [PATCH 1/2] add .idea_modules/

https://github.com/mpeltonen/sbt-idea generates this folder
---
 Global/IntelliJ.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Global/IntelliJ.gitignore b/Global/IntelliJ.gitignore
index 7d89b9c0..fadcf7f5 100644
--- a/Global/IntelliJ.gitignore
+++ b/Global/IntelliJ.gitignore
@@ -2,3 +2,4 @@
 *.ipr
 *.iws
 .idea/
+.idea_modules/

From 94a2b3b6685742c7ef314af8d05302916c96e700 Mon Sep 17 00:00:00 2001
From: Ivan Yatskevich <ivan@yatskevich.com>
Date: Tue, 12 Nov 2013 14:38:34 +0300
Subject: [PATCH 2/2] add .idea_modules/ to Global/JetBrains.gitignore

---
 Global/JetBrains.gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
index 9f20c505..5db4d2e7 100644
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -18,3 +18,6 @@
 
 ## Additional for IntelliJ
 out/
+
+# generated by mpeltonen/sbt-idea plugin
+.idea_modules/