Fix upstream branch

[mirror_smartmontools-debian.git] / smartd.conf.5.in

diff --git a/smartd.conf.5.in b/smartd.conf.5.in
index d39babba5a828c3b209187b66a280b6ca5906707..7c38e649a0300a43f65ed720b87b341be9cc1453 100644 (file)
--- a/smartd.conf.5.in
+++ b/smartd.conf.5.in
@@ -1,14 +1,8 @@
 .ig
 Copyright (C) 2002-10 Bruce Allen
-<<<<<<< HEAD
 Copyright (C) 2004-16 Christian Franke
 
 $Id: smartd.conf.5.in 4307 2016-04-24 12:37:31Z chrfranke $
-=======
-Copyright (C) 2004-15 Christian Franke
-
-$Id: smartd.conf.5.in 4103 2015-06-01 19:51:18Z 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
@@ -584,11 +578,7 @@ Directive are \fIon\fP and \fIoff\fP.  Also affects SCSI devices.
 [Please see the \fBsmartctl \-S\fP command-line option.]
 .TP
 .B \-H
-<<<<<<< HEAD
 [ATA] Check the health status of the disk with the SMART RETURN
-=======
-[ATA only] Check the health status of the disk with the SMART RETURN
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 STATUS command.
 If this command reports a failing health status, then disk
 failure is predicted in less than 24 hours, and a message at loglevel
@@ -1528,13 +1518,10 @@ will do the same, but restricts the scan to ATA devices only.
 will do the same, but only monitors the SMART health status of the
 devices, (rather than the default \-a, which monitors all SMART
 properties).
-<<<<<<< HEAD
 .br
 [NEW EXPERIMENTAL SMARTD FEATURE]
 Multiple \'\-d TYPE\' options may be specified with DEVICESCAN
 to combine the scan results of more than one TYPE.
-=======
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 Configuration entries for specific devices may precede the \fBDEVICESCAN\fP entry.
 For example
@@ -1626,8 +1613,4 @@ full path of this file.
 .SH PACKAGE VERSION
 CURRENT_SVN_VERSION CURRENT_SVN_DATE CURRENT_SVN_REV
 .br
-<<<<<<< HEAD
 $Id: smartd.conf.5.in 4307 2016-04-24 12:37:31Z chrfranke $
-=======
-$Id: smartd.conf.5.in 4103 2015-06-01 19:51:18Z chrfranke $
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74