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

[mirror_smartmontools-debian.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 107304e35eb41bd3942984070ee26cfdefa4eed1..9bc638c448b35fd5848a12c1fc777682973a419b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 $Id: ChangeLog 4324 2016-05-31 20:45:50Z chrfranke $
 
 2016-05-31  Christian Franke  <franke@computer.org>
@@ -687,6 +688,9 @@ $Id: ChangeLog 4324 2016-05-31 20:45:50Z chrfranke $
 
        drivedb.h:
        - USB: SimpleTech 3.0 bridge (0x4971:0x8017), reported in #554
+=======
+$Id: ChangeLog 4109 2015-06-04 16:30:15Z chrfranke $
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 2015-06-04  Christian Franke  <franke@computer.org>