Revision 5be00b4b
ID | 5be00b4b55abf54498a1520945b4a92b1ac01798 |
Parent | 52469de0 |
Child | edada04b |
Fix incorrect conflict resolution in lib/cmdlib/instance.py
Between the last two merges, nothing happened on stable-2.9. The
only change on stable-2.8 that touched lib/cmdlib/instance.py is
ff34fb97. So make sure, the net change since the last merge to
this file is that of the said commit. This also fixes the doclint
errors.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
Files
- added
- modified
- copied
- renamed
- deleted