From 3a02c22cf7e9572c3ec03b464d2b91fac8416e1e Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Wed, 12 Jan 2011 22:05:09 +0100 Subject: [PATCH] fix broken merge --- src/target/firmware/apps/simtest/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/target/firmware/apps/simtest/main.c b/src/target/firmware/apps/simtest/main.c index 3cff205..44c7adf 100755 --- 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) { -- 2.20.1