Ubuntu Notes app

Code review comment for lp:~mzanetti/reminders-app/add-image-support

  1. add-image-support
  2. Merge into trunk
Revision history for this message
David Planella (dpm) wrote :

Ah, trying to merge manually shows the actual conflicts:

RM src/plugin/Evernote/utils/html2enmlconverter.cpp => src/plugin/Evernote/utils/enmldocument.cpp
RM src/plugin/Evernote/utils/html2enmlconverter.h => src/plugin/Evernote/utils/enmldocument.h
Text conflict in src/plugin/Evernote/utils/enmldocument.cpp
Text conflict in src/plugin/Evernote/utils/enmldocument.h
2 conflicts encountered.

review: Needs Fixing

« Back to merge proposal