[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Weird stuff in the source

Ok, I've found stuff like this in URLInfo.cpp and other places:

<<<<<<< URLInfo.cpp
>>>>>>> 1.4

First, I thougth I was doing something wrong with CVS, but if I am, I'm
unable to see what.

Assuming this really is in the CVS-tree, who put that there? It's been
there for a couple of days, and it quite obviously keeps PFile from