[Paraview] Error In CVS Version of vtkPVServerInformation.cxx

[Utkarsh Ayachit]

Looks like you have a conflict in vtkPVServerInformation.cxx. Did you 
change that file? If there are no useful changes in it, then simply 
remove the file and do a "cvs update" again.

Utkarsh

Kent Eschenberg wrote:
> Compiling the CVS version from earlier today reveals a series of errors 
> starting with this one:
> 
> Servers/Common/vtkPVServerInformation.cxx:111: error: expected 
> primary-expression before ‘<<’ token
> 
> There are things in the file that look like a CVS comparison:
> 
> <<<<<<< vtkPVServerInformation.cxx
> =======
>>>>>>>> 1.14
> 
> Could whoever checked in that file clean that up then let me and/or the 
> list know so I can grab it again.
> 
> Thanks!
> Kent
> Pittsburgh Supercomputing Center
> _______________________________________________
> ParaView mailing list
> ParaView at paraview.org
> http://www.paraview.org/mailman/listinfo/paraview
>