← Back to team overview

elementary-dev-community team mailing list archive

Thread
Date

Re: [Merge] lp:~elementary-dev-community/pantheon-terminal/fix-1329550 into lp:pantheon-terminal

To: Cameron Norman <camerontnorman@xxxxxxxxx>
From: RabbitBot <rabbitbot@xxxxxxxxxxxxxxxx>
Date: Sat, 09 Aug 2014 15:31:19 -0000
In-reply-to: <20140805200323.25520.55545.launchpad@ackee.canonical.com>
Reply-to: mp+229683@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Attempt to merge into lp:pantheon-terminal failed due to conflicts: 

text conflict in data/pantheon-terminal.desktop
-- 
https://code.launchpad.net/~elementary-dev-community/pantheon-terminal/fix-1329550/+merge/229683
Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/pantheon-terminal/fix-1329550.

References

[Merge] lp:~elementary-dev-community/pantheon-terminal/fix-1329550 into lp:pantheon-terminal
From: Cameron Norman, 2014-08-05