diff options
| author | Miles Bader | 2004-02-09 12:42:04 +0000 |
|---|---|---|
| committer | Miles Bader | 2004-02-09 12:42:04 +0000 |
| commit | 429e7e2d69dd0fab7389dc4f7fc6e95d3e4bd612 (patch) | |
| tree | d3f20eec9315f2e498839a0334812ae25231cbc2 /src | |
| parent | 41840482b07840a5f8f5cbc9ea99bb08f26afcd8 (diff) | |
| download | emacs-429e7e2d69dd0fab7389dc4f7fc6e95d3e4bd612.tar.gz emacs-429e7e2d69dd0fab7389dc4f7fc6e95d3e4bd612.zip | |
Resolve CVS conflicts
Diffstat (limited to 'src')
| -rw-r--r-- | src/fringe.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 () | |||
| 1316 | 1316 | ||
| 1317 | #endif /* HAVE_WINDOW_SYSTEM */ | 1317 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 1318 | 1318 | ||
| 1319 | /* arch-tag: 04596920-43eb-473d-b319-82712338162d | ||
| 1320 | (do not change this comment) */ | ||