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

diff --git a/debian/changelog b/debian/changelog
index 20e7866..ddbb4c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,9 @@
-<<<<<<< HEAD
 postfix-cn (3.4.10~cn0) stable; urgency=medium
 
   * Prva verzija za buster
 
  -- 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. 
@@ -16,7 +13,6 @@ postfix-cn (3.1.8~cn2) stable; urgency=medium
  -- 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"