[Elementary-dev-community] [Merge] lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413 into lp:switchboard-plug-pantheon-shell
The proposal to merge lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413 into lp:switchboard-plug-pantheon-shell has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413/+merge/182417 -- https://code.launchpad.net/~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413/+merge/182417 Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413. -- Mailing list: https://launchpad.net/~elementary-dev-community Post to : elementary-dev-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~elementary-dev-community More help : https://help.launchpad.net/ListHelp
Re: [Elementary-dev-community] [Merge] lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413 into lp:switchboard-plug-pantheon-shell
I have worked on this and rebased it. Merge request here. This is how the conflicts text is formatted: conflict-free code TREE pre-merge code === code from where you were trying to merge from MERGE-SOURCE conflict-free code Once you merge the code from all of those types of sections in a file, you just use `bzr resolve FileName.vala`. -- https://code.launchpad.net/~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413/+merge/182417 Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413. -- Mailing list: https://launchpad.net/~elementary-dev-community Post to : elementary-dev-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~elementary-dev-community More help : https://help.launchpad.net/ListHelp
Re: [Elementary-dev-community] [Merge] lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413 into lp:switchboard-plug-pantheon-shell
Got some other stuff to be done first, but I will have a look at it next week. -- https://code.launchpad.net/~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413/+merge/182417 Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413. -- Mailing list: https://launchpad.net/~elementary-dev-community Post to : elementary-dev-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~elementary-dev-community More help : https://help.launchpad.net/ListHelp
