Skip to content

Commit

Permalink
Rebase conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
urholaukkarinen committed May 11, 2024
1 parent 8c6ae1f commit 75ce826
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crates/transform-gizmo-bevy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ impl Default for GizmoOptions {
group_targets: true,
mode_override: None,
hotkeys: Some(GizmoHotkeys::default()),
viewport_rect: None,
}
}
}
Expand Down Expand Up @@ -166,7 +167,6 @@ impl Default for GizmoHotkeys {
toggle_z: Some(KeyCode::KeyZ),
deactivate_gizmo: Some(KeyCode::Escape),
mouse_click_deactivates: true,
viewport_rect: None,
}
}
}
Expand Down

0 comments on commit 75ce826

Please sign in to comment.