Remove conflict markers

Sergey Poznyakoff
Commit 7ddc0798 ... 7ddc0798ab14e140967c2091dfad27bbd93a163e authored 2007-06-28 08:00:24 +0000 by Sergey Poznyakoff
Showing 1 changed file with 0 additions and 1 deletions
include/mailutils/stream.h
--- a/include/mailutils/stream.h
View file @7ddc079
+++ b/include/mailutils/stream.h
View file @7ddc079
 /* 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