X-Git-Url: http://git.maemo.org/git/?p=qwp;a=blobdiff_plain;f=qtc_packaging%2Fdebian_fremantle%2Fchangelog;h=af4cf2d2f7ff51d3c40f2a51d69625ac09be6831;hp=12e4fcc64341fa0ac080cdf1d08471810dd1afbd;hb=a4ed1ea7e44c4fa47c3c13db01e87e32aef42ed9;hpb=35062d3928ada7bfcb8f08201897545f91b7731b

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 12e4fcc..af4cf2d 100644
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 qwp (0.0.1) unstable; urgency=low
+=======
+qwp (0.0.1) unstable; urgency=low
+>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
 
   * Initial Release.