- Revision
- 16105
- Author
- rae
- Date
- 2007-12-11 08:56:13 -0800 (Tue, 11 Dec 2007)
Log Message
Re-committing patch for bug 11450 (Traceback on click of "view 1 pending change" red bar in detail view), r=Morgen
Modified Paths
Diff
Modified: trunk/chandler/application/dialogs/ConflictDialog.py (16104 => 16105)
--- trunk/chandler/application/dialogs/ConflictDialog.py 2007-12-11 16:46:50 UTC (rev 16104) +++ trunk/chandler/application/dialogs/ConflictDialog.py 2007-12-11 16:56:13 UTC (rev 16105) @@ -166,6 +166,7 @@ # L10N: The <emphasis> and </emphasis> tags are used in the Conflict Resolution dialog # to make the text in between the tags bold. fmt = _(u"%(conflictNumber)3d. %(user)s removed this item from the <emphasis>collection</emphasis>") + c.value = "" elif c.change.exclusions: # stamp changed on an item where stamp was removed on the server if "sharing.model.MailMessageRecord" in c.value:
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
