diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2014-11-09 11:23:46 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2014-11-09 11:23:46 +0100 |
| commit | 1af3b1135a6583de83c83d4d9fdcfb24f0b7335b (patch) | |
| tree | 1596da8844693b6b91c5cec53f771d11fe30af93 /lisp/cedet/srecode/java.el | |
| parent | 57db3f3adc251b628c5aea7e513a66f9305fdd4b (diff) | |
| download | emacs-1af3b1135a6583de83c83d4d9fdcfb24f0b7335b.tar.gz | |
Clean up merge error.
* nsterm.m (ns_set_vertical_scroll_bar)
(ns_set_horizontal_scroll_bar): Cleanup merge error.
Diffstat (limited to 'lisp/cedet/srecode/java.el')
0 files changed, 0 insertions, 0 deletions