From b5b60b9482c228ff23c79810239fb0f257149a56 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Sat, 4 Oct 2014 20:24:03 +0200
Subject: [PATCH] Merge and extent .gitignore files

---
 .gitignore     | 13 +++++++++++++
 src/.gitignore | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34c3000fd5..984568a3b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,16 @@
 env/
+.coverage
+htmlcov/
+.ropeproject
+*.sqlite3
+*.db
+*.py[cod]
 *.swp
+*.aux
+*.log
+*.toc
+*.mo
 *~
+.ropeproject
+__pycache__/
+_static/
diff --git a/src/.gitignore b/src/.gitignore
index 0d27eb1905..e69de29bb2 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,12 +0,0 @@
-*.sqlite3
-*.db
-*.py[cod]
-*.swp
-*.aux
-*.log
-*.toc
-*.mo
-*~
-.ropeproject
-__pycache__/
-_static/