From 6afb58ec5b3910ea0daa49c2e4d6199ce7ca9832 Mon Sep 17 00:00:00 2001
From: John Smith <you@example.com>
Date: Sun, 24 May 2026 15:27:20 -0400
Subject: [PATCH] merge: resolve rebase conflicts (Cargo.lock, engine lib.rs,
 predictor lib.rs)

---
 crates/heretek-engine/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/heretek-engine/src/lib.rs b/crates/heretek-engine/src/lib.rs
index 7103637..22c10a5 100644
--- a/crates/heretek-engine/src/lib.rs
+++ b/crates/heretek-engine/src/lib.rs
@@ -162,7 +162,7 @@ pub fn compress_to_bytes(input: &[u8], predictor: &dyn Predictor) -> Result<Vec<
 /// Convenience: decompress `compressed` using `predictor`.
 pub fn decompress_from_bytes(
     compressed: &[u8],
-    predictor: &dyn Predictor,)
+    predictor: &dyn Predictor,
 ) -> Result<Vec<u8>, HeretikError> {
     if compressed.len() < 60 {
         return Err(FormatError::TruncatedHeader.into());