Fix upstream branch

[mirror_smartmontools-debian.git] / atacmds.h

diff --git a/atacmds.h b/atacmds.h
index a66364fcd2a564da7778cdcc6f3d3c80e7842e55..5768677acd2fec3b18b13572ab1a2a2ec14d08f0 100644 (file)
--- a/atacmds.h
+++ b/atacmds.h
@@ -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>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,11 +25,7 @@
 #ifndef ATACMDS_H_
 #define ATACMDS_H_
 
-<<<<<<< HEAD
 #define ATACMDS_H_CVSID "$Id: atacmds.h 4162 2015-10-31 16:36:16Z chrfranke $"
-=======
-#define ATACMDS_H_CVSID "$Id: atacmds.h 4048 2015-03-29 16:09:04Z chrfranke $"
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 #include "dev_interface.h" // ata_device