-
Committer:
Tarmac
-
Author(s):
facundo at com
-
Date:
2009-10-01 18:21:35 UTC
-
mfrom:
(225.3.3 move-over-conflict)
-
Revision ID:
john.lenton@canonical.com-20091001182135-r37pyh7fsrll4wdy
This allows fix the .conflict file moving it over the old one (or rename it to no conflict).