From 38ca3f262e7347aafb4340955f0b6ed9993a71c5 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Wed, 29 Apr 2020 23:58:44 -0500 Subject: [PATCH] Git: Do not attempt to diff/merge Cargo.lock --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c353fc3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +Cargo.lock binary