Solve comflict 2

deepmodeling · May 20, 2024 · acb2a67 · acb2a67
1 parent cac06ec
commit acb2a67
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/deepmd/main.py b/deepmd/main.py
@@ -274,11 +274,6 @@ def main_parser() -> argparse.ArgumentParser:
         default="",
         help="(Supported backend: PyTorch) Model branch chosen for fine-tuning if multi-task. If not specified, it will re-init the fitting net.",
     )
-    parser_train.add_argument(
-        "--list-model-branch",
-        action="store_true",
-        help="(Supported backend: PyTorch) List model branches of a multitask pretrained model.",
-    )
     parser_train.add_argument(
         "--force-load",
         action="store_true",
@@ -770,14 +765,7 @@ def main_parser() -> argparse.ArgumentParser:
         """
         ),
     )
-<<<<<<< HEAD
     parser_list_model_branch.add_argument("INPUT", help="The input multi-task pre-trained model file")
-=======
-    parser_list_model_branch.add_argument(
-        "INPUT", help="The input multi-task pre-trained model file"
-    )
-
->>>>>>> 50b00090e1ac2777faf84446f5d4e04bcef55188
     return parser