diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..a6a455dc --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +README merge=ours \ No newline at end of file