Ubuntu Calendar App

Code review comment for lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed

  1. weekview-testing-stubs-completed
  2. Merge into trunk
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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.

review: Needs Fixing

« Back to merge proposal