Resolve CVS conflicts

2004-02-09 12:42:04 +00:00
parent 41840482b0
commit 429e7e2d69
1 changed files with 2 additions and 0 deletions
--- 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) */