From 1e8496da4a17ec257f2d0dc42267b06c204d1864 Mon Sep 17 00:00:00 2001
From: vitaut <victor.zverovich@gmail.com>
Date: Fri, 31 Jul 2015 09:38:08 -0700
Subject: [PATCH] Keep our .travis.yml during merge

because it contains Coverity Scan configuration.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..cd003ef4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.travis.yml merge=ours