fix changelog conflict

[proxmark3-svn] / armsrc / lfops.c

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index dc7ffd8818d9f7e9829dad12f26613ba4e09106d..d7f91c533e041be303e657a79471f33f8535a682 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -321,7 +321,7 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 {
 
 
-FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
        if(crc == 0) {
                crc = update_crc16(crc, (idlo)&0xff);
                crc = update_crc16(crc, (idlo>>8)&0xff);
@@ -1840,12 +1840,6 @@ void ReadPCF7931() {
                        Dbprintf("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
                                         Blocks[i][0], Blocks[i][1], Blocks[i][2], Blocks[i][3], Blocks[i][4], Blocks[i][5], Blocks[i][6], Blocks[i][7],
                                        Blocks[i][8], Blocks[i][9], Blocks[i][10], Blocks[i][11], Blocks[i][12], Blocks[i][13], Blocks[i][14], Blocks[i][15]);
-               if(i==3){       
-                       if(Blocks[3][0] == 0xAA)
-                       Dbprintf("Solde actuel : %d centimes,  solde précédent : %d centimes", (Blocks[3][1] << 8 | Blocks[3][2]), (Blocks[3][6] << 8 | Blocks[3][7]));
-                       else
-                       Dbprintf("Solde actuel : %d centimes,  solde précédent : %d centimes", (Blocks[3][6] << 8 | Blocks[3][7]), (Blocks[3][1] << 8 | Blocks[3][2]));
-               }
                }else
                        Dbprintf("<missing block %d>", i);
        }