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

[mirror_smartmontools-debian.git] / scsiprint.cpp

diff --git a/scsiprint.cpp b/scsiprint.cpp
index 42e43e65a4c4148871926c728ba6b3e2349abd2c..52b701246abd94d1d91503aad2b9c1961bb227be 100644 (file)
--- a/scsiprint.cpp
+++ b/scsiprint.cpp
@@ -40,7 +40,11 @@
 
 #define GBUF_SIZE 65535
 
+<<<<<<< HEAD
 const char * scsiprint_c_cvsid = "$Id: scsiprint.cpp 4292 2016-04-12 23:06:59Z dpgilbert $"
+=======
+const char * scsiprint_c_cvsid = "$Id: scsiprint.cpp 4040 2015-03-10 22:30:44Z dpgilbert $"
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
                                  SCSIPRINT_H_CVSID;