fix broken merge

[osmocom-bb.git] / src / target / firmware / apps / simtest / main.c

diff --git a/src/target/firmware/apps/simtest/main.c b/src/target/firmware/apps/simtest/main.c
index 3cff205..44c7adf 100755 (executable)
--- a/src/target/firmware/apps/simtest/main.c
+++ b/src/target/firmware/apps/simtest/main.c
@@ -158,8 +158,6 @@ uint16_t sim_readbinary(uint8_t offset_high, uint8_t offset_low, uint8_t length,
        return (status_word[0] << 8) | status_word[1];
 }
 
-<<<<<<< HEAD
-=======
 uint16_t sim_verify(char *pin)
 {
        uint8_t txBuffer[8];
@@ -212,7 +210,6 @@ void delay_ms(unsigned int ms)
 
 
 
->>>>>>> [WIP] target/fw/sim: SIM Layer 1 driver
 /* Execute my (dexter's) personal test */
 void do_sim_test(void)
 {