* nsterm.m (ns_set_vertical_scroll_bar) (ns_set_horizontal_scroll_bar): Cleanup merge error.
Attach a file by drag & drop or click to upload
