Fix upstream branch

[mirror_smartmontools-debian.git] / ataprint.cpp

diff --git a/ataprint.cpp b/ataprint.cpp
index 6f47fd99a91f317b021ccc41920ab9781dca4842..fe94593caa344a86c67956c44a95628c4c170285 100644 (file)
--- a/ataprint.cpp
+++ b/ataprint.cpp
@@ -4,11 +4,7 @@
  * 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) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -44,11 +40,7 @@
 #include "utility.h"
 #include "knowndrives.h"
 
-<<<<<<< HEAD
 const char * ataprint_cpp_cvsid = "$Id: ataprint.cpp 4256 2016-03-27 16:51:32Z chrfranke $"
-=======
-const char * ataprint_cpp_cvsid = "$Id: ataprint.cpp 4104 2015-06-03 18:50:39Z chrfranke $"
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
                                   ATAPRINT_H_CVSID;
 
 
@@ -705,10 +697,7 @@ static void print_drive_info(const ata_identify_device * drive,
   pout("ATA Version is:   %s\n", infofound(ataver.c_str()));
 
   // Print Transport specific version
-<<<<<<< HEAD
     // cppcheck-suppress variableScope
-=======
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   char buf[32] = "";
   unsigned short word222 = drive->words088_255[222-88];
   if (word222 != 0x0000 && word222 != 0xffff) switch (word222 >> 12) {
@@ -1554,7 +1543,6 @@ static void print_device_statistics_page(const unsigned char * data, int page)
       page, offset,
       abs(size),
       valstr,
-<<<<<<< HEAD
       ((flags & 0x20) ? 'N' : '-'), // normalized statistics
       ((flags & 0x10) ? 'D' : '-'), // supports DSN (ACS-3)
       ((flags & 0x08) ? 'C' : '-'), // monitored condition met (ACS-3)
@@ -1562,15 +1550,6 @@ static void print_device_statistics_page(const unsigned char * data, int page)
       ( info          ? info[i].name :
        (page == 0xff) ? "Vendor Specific" // ACS-4
                       : "Unknown"        ));
-=======
-      (flags & 0x20 ? 'N' : '-'), // normalized statistics
-      (flags & 0x10 ? 'D' : '-'), // supports DSN (ACS-3)
-      (flags & 0x08 ? 'C' : '-'), // monitored condition met (ACS-3)
-      (flags & 0x07 ? '+' : ' '), // reserved flags
-      (info         ? info[i].name :
-       page == 0xff ? "Vendor Specific" // ACS-4
-                    : "Unknown"        ));
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   }
 }