Remove conflict markers (because cvs didn't warn me at the right time,
tree07c1f59d926f9d7399b0b46addb796add1e16bad
drwxr-xr-x - xapian-applications
drwxr-xr-x - xapian-core
drwxr-xr-x - xapian-data
drwxr-xr-x - xapian-examples