Ubuntu Calendar App

Code review comment for lp:~pkunal-parmar/ubuntu-calendar-app/CalManagement

  1. CalManagement
  2. Merge into trunk
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Needs to be rebased with trunk :-)

Text conflict in AgendaView.qml
Text conflict in EventBubble.qml
Text conflict in TimeLineBase.qml
Text conflict in calendar.qml
4 conflicts encountered.
bzr: ERROR: Conflicts from merge

« Back to merge proposal