clean ups

zinongli · zinongli · commit 55538afde472 · 2024-07-28T16:07:49.000-04:00
diff --git 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));
 

Original file line number	Diff line number	Diff line change
`@@ -374,11 +374,7 @@ void t5577_writer_update_config_from_load(void* context) {`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`
`377`		`-<<<<<<< Updated upstream`
`378`		`- my_model->user_block_num = (my_model->content[0] >> LFRFID_T5577_MAXBLOCK_SHIFT) & 0xF;`
`379`		`-=======`
`380`	`377`	`my_model->user_block_num = (my_model->content[0] >> LFRFID_T5577_MAXBLOCK_SHIFT) & 0xE;`
`381`		`->>>>>>> Stashed changes`
`382`	`378`
`383`	`379`	`memset(my_model->data_loaded, true, sizeof(my_model->data_loaded));`
`384`	`380`