[girl/f24: 5/5] Update to 9.5.1

[Martin Gansser]

commit 6b95c0a089e08ede11b2dccd8b20ea8cc32999b2
Author: Martin Gansser <mgansser at alice.de>
Date:   Fri Sep 9 20:46:04 2016 +0200

    Update to 9.5.1

 .gitignore | 4 ----
 1 file changed, 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a1ef0f..bf5e9e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/girl-9.4.0.tar.xz
-<<<<<<< HEAD
-=======
 /girl-9.5.1.tar.xz
->>>>>>> master