From e46de3421efa9e756b9570ae3b74ed8075da9af4 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 10 Jul 2023 00:38:34 +0200
Subject: [PATCH] resolve merge conflict

---
 src/ecss/tc.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ecss/tc.rs b/src/ecss/tc.rs
index 2dc61c6..ba92be2 100644
--- a/src/ecss/tc.rs
+++ b/src/ecss/tc.rs
@@ -1199,7 +1199,7 @@ mod tests {
         assert!(res.is_err());
         let err = res.unwrap_err();
         match err {
-            PusError::ByteConversionError(err) => match err {
+            PusError::ByteConversion(err) => match err {
                 ByteConversionError::ToSliceTooSmall(missmatch) => {
                     assert_eq!(missmatch.expected, pus_tc.len_packed());
                     assert_eq!(missmatch.found, 12);