Remove conflict markers from last commit.
Authored by: mdboom 2009-11-03
Parent: [r7922]
Child: [r7924]