OSDN Git Service

Correct problem where conflict notebooks were not the proper color.