Code review comment for lp:~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync

Please create a new branch based on lp:ubuntu-system-settings/rtm-14.09 and merge just the commits from trunk into your new branch. Then propose that branch.

For example:

bzr branch lp:ubuntu-system-settings/rtm-14.09
cd rtm-14.09
bzr merge lp:ubuntu-system-settings -r 1187..1189

However that will still conflict slightly, you'll need to manually merge 2 files because they have diverged too much between trunk and rtm at this point.