From 55538afde4725044e864a4a84d5da449b45c0d4a Mon Sep 17 00:00:00 2001
From: zinongli <131403964+zinongli@users.noreply.github.com>
Date: Sun, 28 Jul 2024 16:07:49 -0400
Subject: [PATCH] clean ups

---
 t5577_writer.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/t5577_writer.c b/t5577_writer.c
index 02ca104addc..be490747c92 100644
--- a/t5577_writer.c
+++ b/t5577_writer.c
@@ -374,11 +374,7 @@ void t5577_writer_update_config_from_load(void* context) {
         }
     }
 
-<<<<<<< Updated upstream
-    my_model->user_block_num = (my_model->content[0] >> LFRFID_T5577_MAXBLOCK_SHIFT) & 0xF;
-=======
     my_model->user_block_num = (my_model->content[0] >> LFRFID_T5577_MAXBLOCK_SHIFT) & 0xE;
->>>>>>> Stashed changes
 
     memset(my_model->data_loaded, true, sizeof(my_model->data_loaded));