From 7568190713528f05df5bf6d94c92ffd27846baa8 Mon Sep 17 00:00:00 2001
From: Ulf Seltmann <seltmann@ub.uni-leipzig.de>
Date: Mon, 3 Nov 2014 15:06:49 +0100
Subject: [PATCH] added git config

Conflicts:
	.gitignore
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4a8ccc11d29..0e4e3e0bbd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ ChangeLog
 TAGS
 *~
 vendor/.git
-.bash_history
\ No newline at end of file
+.bash_history
+.idea
-- 
GitLab