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 : [email protected]
Unsubscribe : https://launchpad.net/~elementary-dev-community
More help : https://help.launchpad.net/ListHelp
