Date: Mon Jul 8 08:17:19 2002 Author: laforge Update of /cvsroot/netfilter/tutorial In directory kashyyyk:/tmp/cvs-serv30767 Modified Files: Makefile Log Message: remove conflict indicators Revisions: Makefile 1.5 => 1.6 http://cvs.netfilter.org/cgi-bin/cvsweb/netfilter/tutorial/Makefile?r1=1.5&r2=1.6