Merge lp:~ubuntu-branches/ubuntu/maverick/ubuntuone-client/maverick-201006161146 into lp:ubuntu/maverick/ubuntuone-client

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/ubuntuone-client now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/ubuntuone-client/maverick-201006161146. A merge should be performed if necessary.

[dobey (dobey)]

The only thing in this diff is conflict marking text, and a duplicated line.

review: Disapprove

Unmerged revisions

31. By Ken VanDine on 2010-04-27

releasing version 1.2.1-0ubuntu2

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-08 17:31:18 +0000
+++ debian/changelog	2010-06-16 11:49:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntuone-client (1.3.0-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
@@ -6,6 +7,9 @@
  -- Rodney Dawes <[e-mail]>  Tue, 08 Jun 2010 17:31:18 -0400
 
 ubuntuone-client (1.2.1-0ubuntu2) lucid-proposed; urgency=low
+=======
+ubuntuone-client (1.2.1-0ubuntu2) lucid-proposed; urgency=low
+>>>>>>> MERGE-SOURCE
 
   * Add fix-567223.patch.
     - Fixes gtk.MODAL usage and dialog closure. (LP: #567223)