From 02cdd6010b71a213113d48ab72888c181ef023a8 Mon Sep 17 00:00:00 2001
From: simply-nicky <simply.i.nicky@gmail.com>
Date: Mon, 23 Nov 2020 17:54:15 +0100
Subject: [PATCH] gitattributes added

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4fc838a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+dev.ipynb merge=ours
+dev.pyx merge=ours
+dev.pyxbld merge=ours
\ No newline at end of file
-- 
GitLab