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

[mirror_smartmontools-debian.git] / smartctl.cpp

diff --git a/smartctl.cpp b/smartctl.cpp
index 3c2e40569486cf097411416947cd4c8f03f258a9..56158635f648670fe5427529bd2a8596222472c3 100644 (file)
--- a/smartctl.cpp
+++ b/smartctl.cpp
@@ -4,7 +4,11 @@
  * Home page of code is: http://www.smartmontools.org
  *
  * Copyright (C) 2002-11 Bruce Allen
+<<<<<<< HEAD
  * Copyright (C) 2008-16 Christian Franke
+=======
+ * Copyright (C) 2008-15 Christian Franke
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -52,7 +56,11 @@
 #include "smartctl.h"
 #include "utility.h"
 
+<<<<<<< HEAD
 const char * smartctl_cpp_cvsid = "$Id: smartctl.cpp 4311 2016-04-27 21:03:01Z chrfranke $"
+=======
+const char * smartctl_cpp_cvsid = "$Id: smartctl.cpp 4080 2015-05-05 20:31:22Z chrfranke $"
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   CONFIG_H_CVSID SMARTCTL_H_CVSID;
 
 // Globals to control printing