[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: another patch for residue.m
|
From: |
John W. Eaton |
|
Subject: |
Re: another patch for residue.m |
|
Date: |
Thu, 11 Oct 2007 21:59:49 -0400 |
On 11-Oct-2007, Ben Abbott wrote:
| I updated my copy from cvs and compiled ... unfortunately ...
|
| octave:4> which residue
| parse error near line 305 of file /Users/bpabbott/src/octave/07.10.12/
| scripts/polynomial/residue.m
|
| syntax error
|
| >>> <<<<<<< residue.m
| ^
|
| which: `residue' is the script file
These are CVS conflict markers. The conflicts happened because I made
additional changes to the function before I checked it in. Remove
your copy and update and they will go away.
jwe