X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;fp=debian%2Fchangelog;h=3b28b44415e490c4a586587cfbd0cfb6e5a6bca4;hb=09c1a8e433cb181284718af2b57c7810d0819691;hp=33c2f7a018fc9a5361f7c6e1c79433df7f2cf336;hpb=91b98a755e164d2fee808fc19db5a402263e4d51;p=freeside.git

diff --git a/debian/changelog b/debian/changelog
index 33c2f7a01..3b28b4441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,15 @@
-<<<<<<< changelog
 freeside (1.7.4~rc2-1) unstable; urgency=low
 
   * New upstream (RC) release
 
  -- Ivan Kohler <ivan-debian@420.am>  Wed, 12 Aug 2009 14:18:29 -0700
 
-=======
 freeside (1.7.4~rc1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Ivan Kohler <ivan-debian@420.am>  Thu, 23 Jul 2009 14:01:10 -0700
 
->>>>>>> 1.2.6.7
 freeside (1.7.3-1) unstable; urgency=low
 
   * New upstream release