* macfont.m (macfont_draw): * nsterm.m (ns_mouse_position, judge): Clean up merge conflict.
Attach a file by drag & drop or click to upload
