Add additional files

2018-11-17 21:07:02 -05:00 · 2018-11-17 21:07:02 -05:00 · 405cc77dc3
parent 7aba2fffde
commit 405cc77dc3
2 changed files with 2 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,2 @@
+* text=auto
+readme.md merge=union
--- a/contributing.md
+++ b/contributing.md