update conflict for mx-setonce
[gitmo/Moose.git] / mop.h
2010-12-27 Dave Rolsky Merged CMOP into Moose