Hi Bill, what did you mean by local changes? Did you mean that the builder download the latest pfsense_local.sh and try to merge with the current pfsense_local.sh in my builder_scripts folder?
Regards, Kelvin -----Original Message----- From: Bill Marquette [mailto:[EMAIL PROTECTED] Sent: Thursday, April 19, 2007 10:12 AM To: [email protected] Subject: Re: [pfSense Support] pfsense_local.sh On 4/18/07, Kelvin Chiang <[EMAIL PROTECTED]> wrote: > > > Hi, when I run the script to rebuild an iso image, it reported the > following > error: > > ./pfsense_local.sh: 69: Syntax error: redirection unexpected > > Line 69 of pfsense_local.sh shows the following: > <<<<<<< pfsense_local.sh > > Does any of you know why? I have never seen "<<<<<<< pfsense_local.sh" > and ">>>>>>> 1.43" in other revision before, what's that for? Sounds like a merge conflict with your local changes. You'll need to manually merge to fix. --Bill --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
