From 4e0d7258773412950f06905bfef15d53cd0aff9a Mon Sep 17 00:00:00 2001 From: voyagerxyx Date: Fri, 9 May 2025 08:35:31 -0400 Subject: [PATCH] Added .gitattributes to help with merge conflicts --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e201081 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +*.unity merge=unityyamlmerge eol=lf +*.prefab merge=unityyamlmerge eol=lf +*.asset merge=unityyamlmerge eol=lf +*.mat merge=unityyamlmerge eol=lf +*.meta merge=unityyamlmerge eol=lf +