Ubuntu Apps Directory

Code review comment for lp:~canonical-isd-hackers/ubuntu-webcatalog/useragent_778562

  1. useragent_778562
  2. Merge into trunk
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

Attempt to merge into lp:ubuntu-webcatalog failed due to conflicts:

text conflict in src/webcatalog/models.py
text conflict in src/webcatalog/templates/webcatalog/department_overview.html
text conflict in src/webcatalog/templates/webcatalog/search_results.html
text conflict in src/webcatalog/urls.py
text conflict in src/webcatalog/views.py

« Back to merge proposal