← Back to team overview

elementary-dev-community team mailing list archive

Re: [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
    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`.
Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413.