Merge branch 'upstream' of git.debian.org:/git/collab-maint/smartmontools into upstream

[mirror_smartmontools-debian.git] / smartd.8.in

diff --git a/smartd.8.in b/smartd.8.in
index 3ea06283bff1246c97adaa5f01cd3ef861922da5..88375e26d821713e6d817f39ac7bc7658ece7943 100644 (file)
--- a/smartd.8.in
+++ b/smartd.8.in
@@ -1,8 +1,14 @@
 .ig
 Copyright (C) 2002-10 Bruce Allen
+<<<<<<< HEAD
 Copyright (C) 2004-16 Christian Franke
 
 $Id: smartd.8.in 4299 2016-04-16 19:45:57Z chrfranke $
+=======
+Copyright (C) 2004-15 Christian Franke
+
+$Id: smartd.8.in 4102 2015-06-01 19:25:47Z chrfranke $
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -735,6 +741,17 @@ optional local drive database (see \'\-B\' option).
 .\" %ENDIF NOT OS Windows
 .SH AUTHORS
 \fBBruce Allen\fP (project initiator),
+<<<<<<< HEAD
+.br
+\fBChristian Franke\fP (project manager, Windows port and all sort of things),
+.br
+\fBDouglas Gilbert\fP (SCSI subsystem),
+.br
+\fBVolker Kuhlmann\fP (moderator of support and database mailing list),
+.br
+\fBGabriele Pohl\fP (wiki & development team support),
+.br
+=======
 .br
 \fBChristian Franke\fP (project manager, Windows port and all sort of things),
 .br
@@ -744,6 +761,7 @@ optional local drive database (see \'\-B\' option).
 .br
 \fBGabriele Pohl\fP (wiki & development team support),
 .br
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 \fBAlex Samorukov\fP (FreeBSD port and more, new Trac wiki).
 
 Many other individuals have made contributions and corrections,
@@ -793,4 +811,8 @@ Links to these and other documents may be found on the Links page of the
 .SH PACKAGE VERSION
 CURRENT_SVN_VERSION CURRENT_SVN_DATE CURRENT_SVN_REV
 .br
+<<<<<<< HEAD
 $Id: smartd.8.in 4299 2016-04-16 19:45:57Z chrfranke $
+=======
+$Id: smartd.8.in 4102 2015-06-01 19:25:47Z chrfranke $
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74