saco el conflict

diff --git a/emufs/emufs.c b/emufs/emufs.c
index 4b78a7dfa239fb32f2a94f91699c9da1e3a3e467..de9856ed02b674e141a722d88831b8dc2f5df650 100644 (file)
--- a/emufs/emufs.c
+++ b/emufs/emufs.c
@@ -507,10 +507,6 @@ EMUFS_BLOCK_ID emufs_create_new_block(EMUFS *emu)
        dummy = (char*)malloc(emu->tam_bloque);
        memset(dummy, 0, emu->tam_bloque);
        fwrite(dummy, emu->tam_bloque, 1, fp);
-<<<<<<< .mine
-       fprintf(stderr, "new_block ftell = %ld\n", ftell(fp));
-=======
->>>>>>> .r552
        switch(emu->tipo){
                case T1: num = (ftell(fp)-sizeof(EMUFS_Tipo)-sizeof(EMUFS_BLOCK_SIZE))/emu->tam_bloque;
                        break;