added gitattributes and driver ours

2021-05-23 02:01:07 +02:00
parent 500d23b117
commit 22e5afeb3f
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+package.json merge=ours