Resolve merge conflicts from main menu

2024-10-26 21:25:03 -07:00
parent ab3d8bddeb
commit ca280d700e
2 changed files with 5 additions and 15 deletions
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -325,11 +325,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
      propertyPath: swingDistance
-<<<<<<< HEAD
      value: 3
-=======
-      value: 2
->>>>>>> main
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
+      propertyPath: swingRangeDeg
+      value: 21.98
      objectReference: {fileID: 0}
    - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
      propertyPath: distanceIndicator