diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-06-28 08:00:24 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-06-28 08:00:24 +0000 |
| commit | 7ddc0798ab14e140967c2091dfad27bbd93a163e (patch) | |
| tree | bacfa97b3616b9affbe5fec89a740928d5f57f41 /include | |
| parent | 654ef002a4b856420b40f8bda754e912ec301ff3 (diff) | |
| download | mailutils-7ddc0798ab14e140967c2091dfad27bbd93a163e.tar.gz mailutils-7ddc0798ab14e140967c2091dfad27bbd93a163e.tar.bz2 | |
Remove conflict markers
Diffstat (limited to 'include')
| -rw-r--r-- | include/mailutils/stream.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/mailutils/stream.h b/include/mailutils/stream.h index b1983823d..d1c4e6e3e 100644 --- a/include/mailutils/stream.h +++ b/include/mailutils/stream.h @@ -1,5 +1,4 @@ /* GNU Mailutils -- a suite of utilities for electronic mail - Copyright (C) 1999, 2000, 2001, 2005, 2007 Free Software Foundation, Inc. Copyright (C) 1999, 2000, 2001, 2005, 2007 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or |