From: Miles Bader <miles@gnu.org>
Date: Mon, 9 Feb 2004 12:42:04 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: ttn-vms-21-2-B4~7669
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=429e7e2d69dd0fab7389dc4f7fc6e95d3e4bd612;p=emacs.git

Resolve CVS conflicts
---

diff --git a/src/fringe.c b/src/fringe.c
index 6bf35d73d62..f6028d44dc8 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1316,3 +1316,5 @@ w32_reset_fringes ()
 
 #endif /* HAVE_WINDOW_SYSTEM */
 
+/* arch-tag: 04596920-43eb-473d-b319-82712338162d
+   (do not change this comment) */