From 6e27e8a6e12788d7be596b884e6f81337f583d53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicol=C3=A1s=20Dimov?= Date: Sat, 29 May 2004 02:39:32 +0000 Subject: [PATCH] saco el conflict --- emufs/emufs.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/emufs/emufs.c b/emufs/emufs.c index 4b78a7d..de9856e 100644 --- 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; -- 2.43.0