[Fofredux-devel] updating files via cvs

[Miles B. <mil...@gm...>]

I was just updating the files via cvs and got the following error:

cvs -d:pserver:ano...@cv...urcefor                               =20
      ge.net:/cvsroot/fofredux up
cvs update: warning: failed to open /root/.cvspass for reading: No
such file or                                        directory
? cache
? config.php
cvs update: Updating .
U config.php.sample
P edit.php
P fof.css
RCS file: /cvsroot/fofredux/fofredux/init.php,v
retrieving revision 1.17
retrieving revision 1.22
Merging differences between 1.17 and 1.22 into init.php
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in init.php
C init.php
P install.php
P view.php
cvs update: Updating magpierss
cvs update: Updating magpierss/extlib

Then when I try and load FoFRedux I get the following error:

<<<<<<< init.php =3D=3D=3D=3D=3D=3D=3D
Fatal error: Cannot redeclare fof_get_feeds() (previously declared in
/var/www/fofredux_RC-0_2/init.php:62) in
/var/www/fofredux_RC-0_2/init.php on line 1164