From d95fcef57753d177c8451795396835546b7973b8 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 4 Dec 2015 15:07:27 +0100
Subject: [PATCH 1/1] touch merge travis.yml

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 8d1a06c..397f473 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 package.xml		merge=touch
 php_pq.h		merge=touch
+.travis.yml		merge=touch
-- 
2.30.2