From a0c7302d29c618836cb839a471b6020b0066b46e Mon Sep 17 00:00:00 2001 From: boo3 Date: Fri, 23 Jun 2023 17:51:58 +0000 Subject: [PATCH] Update '.gitattributes' --- .gitattributes | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 0d73977..9b7c018 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,6 @@ -<<<<<<< HEAD -======= *.uasset filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text *.ttf filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text ->>>>>>> 2bf64669a35578a26fb57794375793e931527e0b Content/** filter=lfs diff=lfs merge=lfs -text \ No newline at end of file