From e44fe446055ebc0cf9997b531e68da45c964879b Mon Sep 17 00:00:00 2001 From: Merwane Hamadi Date: Mon, 11 Sep 2023 17:42:07 -0700 Subject: [PATCH] fix conflict --- benchmark/benchmark/start_benchmark.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/benchmark/benchmark/start_benchmark.py b/benchmark/benchmark/start_benchmark.py index ce23606a..4235e67a 100644 --- a/benchmark/benchmark/start_benchmark.py +++ b/benchmark/benchmark/start_benchmark.py @@ -431,11 +431,5 @@ def version(): # return latest_report - -<<<<<<< HEAD:benchmark/agbenchmark/start_benchmark.py -# if __name__ == "__main__": -# start() -======= if __name__ == "__main__": cli() ->>>>>>> 61b4afcb (Fixing benchmarks):benchmark/benchmark/start_benchmark.py