Cleanup

sebastianbergmann · Sep 22, 2016 · a270f42 · a270f42
1 parent 41433b0
commit a270f42
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
 /build export-ignore
+
 *.php diff=php
-composer.json merge=ours
-src/Runner/Version.php merge=ours
+