From a43e242716792c4ad7897025d0f81b5816e01b02 Mon Sep 17 00:00:00 2001
From: vitaut <victor.zverovich@gmail.com>
Date: Sun, 18 Oct 2015 10:24:54 -0700
Subject: [PATCH] ours -> keep-ours

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

diff --git a/.gitattributes b/.gitattributes
index cd003ef4..2986db56 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-.travis.yml merge=ours
+.travis.yml merge=keep-ours