Jack Palevich 66a4a6e45f Fix merge conflict markers that accidentally got checked in.
(They were in a comment, so it wasn't detected by the compiler.)
2009-12-21 17:39:58 +08:00
..