OSDN Git Service

[fix] #40282 コンフリクト解決残しを修正. / Resolve conflicts left behind.
authordeskull <deskull@users.sourceforge.jp>
Fri, 10 Apr 2020 16:15:03 +0000 (01:15 +0900)
committerdeskull <deskull@users.sourceforge.jp>
Fri, 10 Apr 2020 16:15:03 +0000 (01:15 +0900)
commit91f83276ec6bf0d1f8856d3ff254818eff01554b
treef6f8946a0d179f532fbe039bd102f50436064d00
parent14d1d52161004ba127ea52222ca35e3659dac2cd
[fix] #40282 コンフリクト解決残しを修正. / Resolve conflicts left behind.
src/main-win.c