From 11f41e2fc5ef9a91cf85bef3b570b9ed20ce8627 Mon Sep 17 00:00:00 2001 From: RocketGod Date: Fri, 4 Nov 2022 10:50:06 -0700 Subject: [PATCH] Revert "November 2022 Update" This reverts commit c6478ea40a9e2cb27276286bf217cc374dd4689e. --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index dd57308..941a842 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,11 @@ # Auto detect text files and perform LF normalization * text=auto +<<<<<<< HEAD <<<<<<< Updated upstream ======= *.c16 filter=lfs diff=lfs merge=lfs -text *.RAW filter=lfs diff=lfs merge=lfs -text *.C16 filter=lfs diff=lfs merge=lfs -text >>>>>>> Stashed changes +======= +>>>>>>> parent of c6478ea... November 2022 Update