~feldgendler/python-apt/829138

Viewing all changes in revision 151.

  • Committer: Alexey Feldgendler
  • Date: 2011-12-07 16:40:15 UTC
  • Revision ID: alexeyf@opera.com-20111207164015-j1oqaszyj45q0hul
handle architecture-specific conflicts correctly (LP: #829138)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: