Resolve merge conflict

2021-01-23 17:17:01 +02:00
parent b7af5c1397 de9b313f6b
commit 925d7f3b8a
316 changed files with 123543 additions and 2285 deletions
--- a/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta
+++ b/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta
@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: b1b95168f2f925246bf670cb2bc2bf79
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: b1b95168f2f925246bf670cb2bc2bf79
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: