rebasing still difficult in 2021

4 years ago · e2c54986f7
1 changed files with 0 additions and 8 deletions
--- a/src/packet/messages.rs
+++ b/src/packet/messages.rs
@ -266,14 +266,6 @@ pub struct PlayerDonatedPB {
    recipient: u32,
 }

-<<<<<<< HEAD
-#[pso_message(0x37)]
-pub struct PlayerInitiatedPB {
-    pb_amount: u8,
-    unknown1: [u8; 4],
-}
-=======
->>>>>>> 799a9e68804633c24b47b759c75269f7106918cc
 #[pso_message(0x39)]
 pub struct PlayerPBReady {
    player: u16,