fixed compile error

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@420 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
This commit is contained in:
kascade 2007-01-12 13:40:23 +00:00
parent deab248cd4
commit 91e1747a4d
1 changed files with 53 additions and 58 deletions

View File

@ -23,6 +23,7 @@ package enginuity.newmaps.definition.index;
import enginuity.newmaps.definition.RomDefinitionHandler;
import enginuity.newmaps.xml.SaxParserFactory;
import static enginuity.util.MD5Checksum.getMD5Checksum;
import enginuity.util.exception.NameableNotFoundException;
import org.xml.sax.SAXParseException;
@ -30,16 +31,10 @@ import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.ObjectOutputStream;
<<<<<<< .mine
import static enginuity.util.MD5Checksum.getMD5Checksum;
import enginuity.util.exception.NameableNotFoundException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Iterator;
import org.xml.sax.SAXParseException;
=======
>>>>>>> .r417
public class IndexBuilder {