[Paraview] Error In CVS Version of vtkPVServerInformation.cxx

[Kent Eschenberg]

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