changeset 53900:5d607f751ba3

Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Mon, 09 Feb 2004 12:42:04 +0000
parents e45e1fbbe83e
children d85f8f2e71f7
files src/fringe.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/fringe.c	Mon Feb 09 09:18:17 2004 +0000
+++ b/src/fringe.c	Mon Feb 09 12:42:04 2004 +0000
@@ -1316,3 +1316,5 @@
 
 #endif /* HAVE_WINDOW_SYSTEM */
 
+/* arch-tag: 04596920-43eb-473d-b319-82712338162d
+   (do not change this comment) */