error in gnc-plugin-budget.c when compiling G2 from trunk

[Derek Atkins]

Quoting Tim Wunder <tim at thewunders.org>:

> Yep. I had changed it in order to get opening budgets to work 
> properly. I rm'd
> the local file and did another svn update and it compiles fine now.
>
> I thought changed local files are left alone during updates. Or is that a CVS
> thing?

Nope, not a CVS thing, either...  If the same file is changed locally
and in the repo, both SVN and CVS will form a conflict.  CVS might just
be a little "better" about trying to merge "the same change".

> Tim

-derek

-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord at MIT.EDU                        PGP key available