From 77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Wed, 6 Dec 2017 15:41:03 +0100
Subject: [PATCH] Do not automatically merge Cargo.lock

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

diff --git a/.gitattributes b/.gitattributes
index e737c7946ef61..2b4f3d472632a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,3 +7,4 @@
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
+Cargo.lock -merge