From a270f42e8a7cac8e2dcb77f9404edd1c59ec39c7 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Thu, 22 Sep 2016 18:34:10 +0100
Subject: [PATCH] Cleanup

---
 .gitattributes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 300d63bdbf8..278ace47a4f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
 /build export-ignore
+
 *.php diff=php
-composer.json merge=ours
-src/Runner/Version.php merge=ours
+