Commit 6f45f869 authored by Jiaquan Huo's avatar Jiaquan Huo
Browse files

resolve conflict previous merging from main

parent 06449bfd

tests/conftest.py

+0 −6
Original line number Diff line number Diff line
@@ -134,12 +134,6 @@ def pytest_addoption(parser): 
        help="If specified, use given param file in test_param_file.",

    )



    parser.addoption(

        "--use_ltv",

        action="store_true",

        help="If specified, run relevant tests with ltv.",

    )



    parser.addoption(

        "--keep_files",

        action="store_true",