diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..379604ed2b --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +public/logo.svg merge=ours +public/favicon.ico merge=ours diff --git a/README.md b/README.md index 051bc973d9..90d8fca6b1 100644 --- a/README.md +++ b/README.md @@ -1,56 +1,49 @@