From f4c0468b8756a617cf2f3dce2f027e0e7dc7c867 Mon Sep 17 00:00:00 2001 From: Nahuel Morales Date: Sat, 18 Nov 2023 11:15:30 -0300 Subject: [PATCH] Fix conflict Cargo.lock --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 31c0baf..a88070e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1617,8 +1617,8 @@ name = "game-off-2023" version = "0.1.0" dependencies = [ "bevy", - "bevy_rapier2d", "bevy_particle_systems", + "bevy_rapier2d", "noise", "rand 0.7.3", ]