From 6da6800747428943adf04d87cff71c1f026280b9 Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Fri, 16 Dec 2011 04:22:07 -0800
Subject: 0.22

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index d0f653e..d9c2805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-conntrack (0.22) unstable; urgency=low
+
+  * Resolved merge errors from Makefile.
+
+ -- Deepti Kulkarni <deepti@vyatta.com>  Fri, 16 Dec 2011 04:22:07 -0800
+
 vyatta-conntrack (0.21) unstable; urgency=low
 
   * Fixing broken build as a result of merge
-- 
cgit v1.2.3