mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-03 18:41:25 -08:00
Resolve CVS conflicts
This commit is contained in:
parent
41840482b0
commit
429e7e2d69
1 changed files with 2 additions and 0 deletions
|
|
@ -1316,3 +1316,5 @@ w32_reset_fringes ()
|
|||
|
||||
#endif /* HAVE_WINDOW_SYSTEM */
|
||||
|
||||
/* arch-tag: 04596920-43eb-473d-b319-82712338162d
|
||||
(do not change this comment) */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue