From: Nicolás Dimov <ndimov@gmail.com>
Date: Sat, 29 May 2004 02:39:32 +0000 (+0000)
Subject: saco el conflict
X-Git-Tag: svn_import_r684~129
X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/commitdiff_plain/6e27e8a6e12788d7be596b884e6f81337f583d53?ds=sidebyside

saco el conflict
---

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;