Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/spamassassin...

[spamassassin-cn.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5f76747..df27142 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
+<<<<<<< HEAD
 spamassassin-cn (2:3.4.0-5) stable; urgency=low
 
   * novi kljuc i sa-update zbog problema opisanih na stranici:
     https://sysportal.carnet.hr/node/1793
 
  -- Ivan Rako <Ivan.Rako@CARNet.hr>  Tue, 18 Dec 2018 20:53:18 +0100
+=======
+spamassassin-cn (2:3.4.1~cn0) stable; urgency=low
+
+  * Prva verzija za stretch
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Sun, 08 Jul 2018 00:12:47 +0200
+>>>>>>> 398d1393b4cd16ac3f5c5dd70295bbdbca78c18d
 
 spamassassin-cn (2:3.4.0-4) stable; urgency=low