From: Michael Wallner <mike@php.net>
Date: Fri, 4 Dec 2015 14:07:27 +0000 (+0100)
Subject: touch merge travis.yml
X-Git-Tag: v1.0.0RC1~3
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=commitdiff_plain;h=d95fcef57753d177c8451795396835546b7973b8

touch merge travis.yml
---

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