generated files as well

SamuelBellomo · SamuelBellomo · commit b02186bf12d9 · 2022-04-28T15:28:25.000-04:00
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1a6495398d12a382182677dd9d5a72ff963e66cd8b17fe3987f3f0e4b7d0eab
+size 842
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta
diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e8379a461b10ae09f3f696911088c16875d63e87ed5f2d95df9e1892703f9fd
+size 1192
diff --git a/ProjectSettings/ProjectSettings.asset.orig b/ProjectSettings/ProjectSettings.asset.orig
@@ -0,0 +1,8 @@
+version https://git-lfs.github.com/spec/v1
+<<<<<<< HEAD
+oid sha256:fdb0df416aca957e3bf9a98c1d761909919b7c35c924953fff26a87b9625a1f0
+size 25267
+=======
+oid sha256:9e1dc10ea1129e4f4e1db3e054f0bb9b3c80b6e07a64873b43b6cee14f1093ed
+size 23279
+>>>>>>> develop
diff --git a/ProjectSettings/RiderScriptEditorPersistedState.asset b/ProjectSettings/RiderScriptEditorPersistedState.asset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46ee3c4178ef86e9a9af73fddaa60a4f202ff1907eb6fafb6eae4ac71bf9dfca
+size 438
diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16a92b7409c2b1f39a3a4c3b49ec6c6ab3a641e55eaaa8f47101026758e3339c
+size 463
diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:c1a6495398d12a382182677dd9d5a72ff963e66cd8b17fe3987f3f0e4b7d0eab`
	`3`	`+size 842`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:1e8379a461b10ae09f3f696911088c16875d63e87ed5f2d95df9e1892703f9fd`
	`3`	`+size 1192`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:46ee3c4178ef86e9a9af73fddaa60a4f202ff1907eb6fafb6eae4ac71bf9dfca`
	`3`	`+size 438`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:16a92b7409c2b1f39a3a4c3b49ec6c6ab3a641e55eaaa8f47101026758e3339c`
	`3`	`+size 463`