From 87566cb8eacf3a283e4593e943a9c716bb2fec2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Mon, 23 Nov 2015 20:59:12 +0100
Subject: [PATCH] Updated .gitignore to include project's code style settings
 file

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index e9c355d0..12166c9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ hs_err_pid*
 
 ## Directory-based project format:
 .idea/
+# Include the project's code style settings file
+!.idea/codeStyleSettings.xml
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff: