patched: shared parser target content

2026-11-08 15:28:26 +01:00 · 2019-06-11 00:23:54 +05:30
parent e44e3ad127
commit 2b3583a30e
1 changed files with 0 additions and 4 deletions
@@ -113,11 +113,7 @@ def shared_parent_parser():
        help="Show checksums instead of file names.",
    )
    shared_parent_parser.add_argument(
-<<<<<<< HEAD
        "targets", nargs="*", default=None, help="Limit the scope to these stage files."
-=======
-        "targets", nargs="*", default=None, help="DVC-files."
->>>>>>> upstream/master
    )

    return shared_parent_parser