boo3/papercraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.thesecretvault.net/boo3/papercraft

Browse Source 
# Conflicts:
#	.gitattributes
This commit is contained in:
boo3 2023-06-23 19:48:45 +02:00
commit 0bd3d5d723
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitattributes vendored
View File

@ -1 +1,9 @@
<<<<<<< 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 Content/** filter=lfs diff=lfs merge=lfs -text