desktopcouch

Code review comment for lp:~thisfred/desktopcouch/fix-fieldmappings

  1. fix-fieldmappings
  2. Merge into trunk
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Attempt to merge into lp:desktopcouch failed due to conflicts:

text conflict in desktopcouch/records/tests/test_field_registry.py
text conflict in desktopcouch/records/tests/test_record.py
text conflict in utilities/lint.sh

« Back to merge proposal