From 04f12295812b6d7c62b7e2236be366f677a3ed06 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Mon, 10 Aug 2009 01:34:22 +0200
Subject: Merge failed.

---
 mpq-bios.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mpq-bios.c b/mpq-bios.c
index 17cc8ad..4c8289d 100644
--- a/mpq-bios.c
+++ b/mpq-bios.c
@@ -543,8 +543,6 @@ uint64_t mpqlib_ioctl(struct mpq_archive_t * mpq_a, enum mpqlib_ioctl_t command,
     va_list ap;
     va_start(ap, command);
 
-    __mpqlib_errno = MPQLIB_ERROR_NO_ERROR;
-    
     __mpqlib_errno = MPQLIB_ERROR_NO_ERROR;
 
     switch(command) {
-- 
cgit v1.2.3