Browse code

*** empty log message ***

Bogdan-Andrei Iancu authored on 07/12/2001 00:10:13
Showing 1 changed files
... ...
@@ -36,7 +36,6 @@ NAME=ser
36 36
 #                  malloc etc.)
37 37
 DEFS=-DNOCR -DMACROEATER -DDNS_IP_HACK  -DSHM_MEM \
38 38
 	 -DPKG_MALLOC #-DDBG_QM_MALLOC
39
->>>>>>> 1.50
40 39
 #-DEXTRA_DEBUG
41 40
 # -DUSE_SHM_MEM
42 41
 #-DNO_DEBUG