X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=postfix-cn.git;a=blobdiff_plain;f=debian%2Fchangelog;h=20e786606699b259f4415e1dc20606c3f2a30655;hp=6fb05ea24d2dbc496d59543921960bb87b0c016e;hb=e190e2817c53fa6b45bfbff3e579b50022196750;hpb=d44d52a09708085dd941ea7cd1d3ba85ad3afbfd

diff --git a/debian/changelog b/debian/changelog
index 6fb05ea..20e7866 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 postfix-cn (3.4.10~cn0) stable; urgency=medium
 
   * Prva verzija za buster
@@ -5,6 +6,17 @@ postfix-cn (3.4.10~cn0) stable; urgency=medium
  -- Ivan Rako <Ivan.Rako@CARNET.hr>  Thu, 13 Aug 2020 19:05:45 +0200
 
 postfix-cn (3.1.8~cn1) stable; urgency=medium
+=======
+postfix-cn (3.1.8~cn2) stable; urgency=medium
+
+  * Non-maintainer upload. 
+  * Dodaje izlazne poslužitelje za webmail u mynetworks (193.198.233.{95,96})
+  * Popravak greške kada duplicira unos "[::1]/128"
+
+ -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Wed, 05 Feb 2020 15:27:43 +0100
+
+ppostfix-cn (3.1.8~cn1) stable; urgency=medium
+>>>>>>> 1185b2ef230939782be3a96949ad7d7dfa738686
 
   * sdbm->btree
   * rjesava gresku "using backwards-compatible default setting chroot=y"