launchpad-reviewers team mailing list archive

[tracy craig <tc.playmate@xxxxxxxxx>]

tracy craig has proposed merging lp:~abentley/launchpad/bugfix-bzr-builder into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~abentley/launchpad/bugfix-bzr-builder/+merge/72685
-- 
https://code.launchpad.net/~abentley/launchpad/bugfix-bzr-builder/+merge/72685
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~abentley/launchpad/bugfix-bzr-builder into lp:launchpad.

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-08-21 22:06:09 +0000
+++ utilities/sourcedeps.conf	2011-08-24 08:44:52 +0000
@@ -1,8 +1,16 @@
+<<<<<<< TREE
 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=68
 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=259
 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=290
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=49
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2717
+=======
+bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=67
+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=258
+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=283
+bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=48
+bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2710
+>>>>>>> MERGE-SOURCE
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
 dulwich lp:~launchpad-pqm/dulwich/devel;revno=426
 difftacular lp:difftacular;revno=6