Fix upstream branch

[mirror_smartmontools-debian.git] / atacmds.cpp

diff --git a/atacmds.cpp b/atacmds.cpp
index 9d77f8e29f64bf376db6d3bc3670b78f5e8653fe..f1974916c8c08a7b2517198c60b0679a35e77c5b 100644 (file)
--- a/atacmds.cpp
+++ b/atacmds.cpp
@@ -3,13 +3,8 @@
  * 
  * Home page of code is: http://www.smartmontools.org
  *
-<<<<<<< HEAD
  * Copyright (C) 2002-11 Bruce Allen
  * Copyright (C) 2008-15 Christian Franke
-=======
- * Copyright (C) 2002-11 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2008-15 Christian Franke <smartmontools-support@lists.sourceforge.net>
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
  *
@@ -41,11 +36,7 @@
 #include "utility.h"
 #include "dev_ata_cmd_set.h" // for parsed_ata_device
 
-<<<<<<< HEAD
 const char * atacmds_cpp_cvsid = "$Id: atacmds.cpp 4301 2016-04-16 20:48:29Z chrfranke $"
-=======
-const char * atacmds_cpp_cvsid = "$Id: atacmds.cpp 4048 2015-03-29 16:09:04Z chrfranke $"
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
                                  ATACMDS_H_CVSID;
 
 // Print ATA debug messages?