[Project_owners] my project page duplicate contents problem

Chris Neale cdn at mozdev.org
Tue Oct 26 12:46:57 EDT 2004

On Tuesday 26 Oct 2004 11:22, Awan Afuqya wrote:
> Hi guys,
> I'm having a problem with the project page I am setting up at:
> http://dragtotab.mozdev.org/resizesearchbox/index.html
> I don't know what I did but whatever I upload as index.html, gets displayed
> on the web with several versions concatenated together.
> It adds some text to the webpage like "<<<<<<< index.html <<<<<<< ======="
> to the top of my index.html and at then at the end it adds ">>>>>>> 1.6".
> Then it repeats the same index.html again 2 times. I'm not too familiar
> with CVS and am using SmartCVS 3 to upload them. I tried deleting the
> index.html file locally and on the server and then committing it again but
> it didn't work.
> Any help is appreciated. Thanks.
> Awan

CVS which manages the pages must have a conflict.




Extensions for Mozilla-based Applications [ http://cdn.mozdev.org/ ]

get Orbit3+1, Orbit Retro and other Mozilla themes from : 

More information about the Project_owners mailing list