Latest cvs broken

[Michael S. Hulet]

I just did a cvs update and make fails in parse_samr.c.

rpc_parse/parse_samr.c: In function `sam_io_sam_dispinfo_1':
rpc_parse/parse_samr.c:1227: parse error before `<'
rpc_parse/parse_samr.c:1230: parse error before `=='
rpc_parse/parse_samr.c:1243: `i' undeclared (first use in this function)
rpc_parse/parse_samr.c:1243: (Each undeclared identifier is reported only
once
rpc_parse/parse_samr.c:1243: for each function it appears in.)
rpc_parse/parse_samr.c:1249: parse error before `<'
rpc_parse/parse_samr.c:1253: `num_sam_entries' undeclared (first use in
this function)
..
..
..
rpc_parse/parse_samr.c:2453: parse error before `=='
make: *** [rpc_parse/parse_samr.o] Error 1


>From parse_samr.c

/*******************************************************************
reads or writes a structure.
********************************************************************/
static void sam_io_sam_dispinfo_1(char *desc, SAM_DISPINFO_1 *sam, uint32
num_en
tries, prs_struct *ps, int depth)
{
<<<<<<< parse_samr.c
        int i,x;
        int entries_added;
=======
        int i;
>>>>>>> 1.50

Lots of <<<<<, =======, and >>>>>> throughout this file.

Can I just delete these lines?  

Michael Hulet
Network System Administrator
ITTC, University of Kansas