ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

Re: [Merge] lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed into lp:ubuntu-calendar-app

To: mp+254495@xxxxxxxxxxxxxxxxxx
From: Nicholas Skaggs <nskaggs@xxxxxxxxxx>
Date: Fri, 10 Apr 2015 14:02:18 -0000
In-reply-to: <20150331204037.31458.41251.launchpad@ackee.canonical.com>
Reply-to: mp+254495@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing

Text conflict in tests/autopilot/calendar_app/__init__.py
Text conflict in tests/autopilot/calendar_app/tests/test_dayview.py
2 conflicts encountered.
bzr: ERROR: Conflicts from merge

Should be a simple fix.
-- 
https://code.launchpad.net/~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed/+merge/254495
Your team Ubuntu Calendar Developers is subscribed to branch lp:ubuntu-calendar-app.

References

[Merge] lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed into lp:ubuntu-calendar-app
From: Carla Sella, 2015-03-31