OSDN Git Service

remove conflict indicator