← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

Re: [Merge] lp:~pkunal-parmar/ubuntu-calendar-app/ReadOnlyCal into lp:ubuntu-calendar-app

To: Nicholas Skaggs <nskaggs@xxxxxxxxxx>
From: Kunal Parmar <pkunal.parmar@xxxxxxxxx>
Date: Fri, 24 Jul 2015 03:49:02 -0000
In-reply-to: <20150723173245.10937.73561.codereview@wampee.canonical.com>
Reply-to: mp+261075@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

> Text conflict in EventDetails.qml
> 1 conflicts encountered.
> bzr: ERROR: Conflicts from merge
> 
> 
> Jenkins is set to merge this once it's fixed.

Thanks nick, I will do the needful
-- 
https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/ReadOnlyCal/+merge/261075
Your team Ubuntu Calendar Developers is subscribed to branch lp:ubuntu-calendar-app.

References

Re: [Merge] lp:~pkunal-parmar/ubuntu-calendar-app/ReadOnlyCal into lp:ubuntu-calendar-app
From: Nicholas Skaggs, 2015-07-23