engine: wscript: fix broken wscript after revert, oops

engine/wscript

@@ -35,9 +35,6 @@ def configure(conf):
 			conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated')
 		conf.env.append_unique('DEFINES', 'XASH_SDL')
 
-	conf.check_cc(header_name='zlib.h', uselib_store='ZLIB')
-	conf.check_cc(lib='z', uselib_store='ZLIB')
-
 	if conf.env.SINGLE_BINARY:
 		conf.env.append_unique('DEFINES', 'SINGLE_BINARY')
 
@@ -52,12 +49,9 @@ def configure(conf):
 	if conf.env.DEST_OS == 'win32':
 		conf.env.append_unique('DEFINES', 'DBGHELP')
 		conf.env.append_unique('DEFINES', 'PSAPI_VERSION=1')
-<<<<<<< HEAD
-    
+
 	if conf.env.DEST_SIZEOF_VOID_P != 4:
 		conf.env.append_unique('DEFINES', 'XASH_64BIT')
-=======
->>>>>>> parent of 9b68b0c... wscript: add zlib library
 
 def build(bld):
 	libs = [ 'public' ]