From 0e1a6f2c45525edb974041145c95d766f36dc05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Saparelli?= <felix@passcod.name>
Date: Sat, 11 Jun 2022 07:38:31 +0000
Subject: [PATCH] Mark Cargo.lock as binary for merging (#305)

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8d93c93
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+Cargo.lock merge=binary