Merge branch 'master' of ssh://drop.maemo.org/git/qwp

[qwp] / qtc_packaging / debian_fremantle / changelog

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 12e4fcc..af4cf2d 100644 (file)
--- 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.