summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e017613db..33c2f7a01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
+<<<<<<< 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