OSDN Git Service

* Makefile.in (CONFLICTS): Fix s/r conflict count to 18.