# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1076330524 0
# Node ID 5d607f751ba354a2694f15e19a681509ac280976
# Parent  e45e1fbbe83eec5fadfda87188a8cef0b0c5dc25
Resolve CVS conflicts

diff -r e45e1fbbe83e -r 5d607f751ba3 src/fringe.c
--- 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) */