fix conflict

This commit is contained in:
Merwane Hamadi
2023-09-11 17:42:07 -07:00
parent d56b4d3368
commit e44fe44605

View File

@@ -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