Skip to content

Commit

Permalink
Fix bad merge on main scene
Browse files Browse the repository at this point in the history
[CI BUILD]
  • Loading branch information
andybak committed Sep 15, 2024
1 parent a6901a9 commit 54dab29
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions Assets/Scenes/Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -10173,7 +10173,6 @@ Transform:
- {fileID: 1251041024}
- {fileID: 128408298}
- {fileID: 8282789105019930893}
- {fileID: 621655958}
- {fileID: 402490430}
- {fileID: 621655958}
- {fileID: 1804317401}
Expand Down Expand Up @@ -10449,12 +10448,6 @@ Transform:
m_PrefabInstance: {fileID: 2135251106}
m_PrefabAsset: {fileID: 0}
--- !u!4 &621655958 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7492514809118701361, guid: 4cc8817a1d87e2247a553ebb5a78735a,
type: 3}
m_PrefabInstance: {fileID: 7492514809570787495}
m_PrefabAsset: {fileID: 0}
--- !u!4 &621655958 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7492514809118701361, guid: 4cc8817a1d87e2247a553ebb5a78735a,
type: 3}
Expand Down Expand Up @@ -31461,9 +31454,6 @@ MonoBehaviour:
- m_Type: 9
m_StencilPrefab: {fileID: 114000010150538192, guid: ecebdb0665594e5fa660d0791b73b7f9,
type: 3}
- m_Type: 9
m_StencilPrefab: {fileID: 114000010150538192, guid: ecebdb0665594e5fa660d0791b73b7f9,
type: 3}
m_StencilAttractDist: 0.5
m_StencilAttachHysteresis: 0.1
m_StencilLayerName: StencilObject
Expand Down

0 comments on commit 54dab29

Please sign in to comment.