Merge branch 'master' of https://vcs.maemo.org/git/livewp

[livewp] / applet / debian / changelog

diff --git a/applet/debian/changelog b/applet/debian/changelog
index d3fc649..51c77a9 100644 (file)
--- a/applet/debian/changelog
+++ b/applet/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 live-wallpaper (0.8.5) unstable; urgency=low
 
   * Fixed number version in dialog "About" 
@@ -16,6 +17,8 @@ live-wallpaper (0.8.3) unstable; urgency=low
 
  -- Vlad Vasiliev <vlad@gas.by>  Sun, 22 Aug 2010 18:39:10 +0200
 
+=======
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 live-wallpaper (0.8.2) unstable; urgency=low
 
   * Updated Finish and Russian translation