From e2c54986f716a56ae9c4ac7b179a2a26aec73b5a Mon Sep 17 00:00:00 2001
From: andy <andynewjack@protonmail.com>
Date: Sun, 20 Jun 2021 02:24:01 +0000
Subject: [PATCH] rebasing still difficult in 2021

---
 src/packet/messages.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/packet/messages.rs b/src/packet/messages.rs
index 5755c7b..e6fa6fb 100644
--- 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,