Merge branch 'main' into shdis-movement

11 months ago · 35bbb58310
parent e3b7fd323a abde32ba73
commit 35bbb58310
6 changed files with 14 additions and 4 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1,2 @@
 Content/** filter=lfs diff=lfs merge=lfs -text
 *.pdf filter=lfs diff=lfs merge=lfs -text
--- a/Content/Levels/Level_alpha.umap
+++ b/Content/Levels/Level_alpha.umap
--- a/Content/Levels/Test_room.umap
+++ b/Content/Levels/Test_room.umap
--- a/Content/Levels/_GENERATED/imoro/Box_5927DA05.uasset
+++ b/Content/Levels/_GENERATED/imoro/Box_5927DA05.uasset
--- a/Content/Levels/_GENERATED/imoro/Box_6FD81623.uasset
+++ b/Content/Levels/_GENERATED/imoro/Box_6FD81623.uasset
--- a/beta.pdf
+++ b/beta.pdf
`@ -1 +1,2 @@`
	`Content/** filter=lfs diff=lfs merge=lfs -text`	`Content/** filter=lfs diff=lfs merge=lfs -text`
		`*.pdf filter=lfs diff=lfs merge=lfs -text`