From 252f382099036ec9da28111c8c0ae349fa378049 Mon Sep 17 00:00:00 2001
From: G2-Games <ke0bhogsg@gmail.com>
Date: Wed, 8 May 2024 09:42:28 -0500
Subject: [PATCH] Fixed merge conflict

---
 cz/src/formats/cz4.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cz/src/formats/cz4.rs b/cz/src/formats/cz4.rs
index f05c773..9d9b72e 100644
--- a/cz/src/formats/cz4.rs
+++ b/cz/src/formats/cz4.rs
@@ -114,12 +114,10 @@ impl CzImage for Cz4Image {
         todo!()
     }
 
-<<<<<<< HEAD
     fn set_bitmap(&mut self, bitmap: &[u8], width: u16, height: u16) {
-        todo!()
-=======
-    fn set_bitmap(&mut self, bitmap: &[u8], header: &Self::Header) {
         self.bitmap = bitmap.to_vec();
->>>>>>> 613e38c6b560990c77e994f2359fc4c30ff112a4
+
+        self.header.common.width = width;
+        self.header.common.height = height;
     }
 }