Revert "Merge pull request 'find-the-sweet-spot' (#13) from find-the-sweet-spot into main"
This reverts commit5b8e4eaeac, reversing changes made to03c0b158a4.
This commit is contained in:
@@ -5,14 +5,8 @@ EditorBuildSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 0
|
||||
path: Assets/Scenes/SampleScene.unity
|
||||
<<<<<<< HEAD
|
||||
guid: 6a18d9b328b6a794da5d050347950362
|
||||
- enabled: 1
|
||||
path: Assets/pojekt.unity
|
||||
guid: f01e25b5a8e60224fa8643bf4f074a71
|
||||
=======
|
||||
path: Assets/Scenes/SampleScene.unity
|
||||
guid: 8afa6ce05eb7dba4c894b910786e3baf
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Client.unity
|
||||
@@ -59,7 +53,6 @@ EditorBuildSettings:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/MiniGame-Satelit.unity
|
||||
guid: 070c4a89027b6e9a28e16859d55f8c66
|
||||
>>>>>>> origin/main
|
||||
m_configObjects:
|
||||
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
|
||||
m_UseUCBPForAssetBundles: 0
|
||||
|
||||
Reference in New Issue
Block a user