Resolve Merge conflicts

triton-inference-server · Jul 23, 2024 · b51eaf6 · b51eaf6
2 parents ff51454 + bf7e90c
commit b51eaf6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/c++/perf_analyzer/test_command_line_parser.cc b/src/c++/perf_analyzer/test_command_line_parser.cc
@@ -372,6 +372,8 @@ void
 CheckValidRange(
     std::vector<char*>& args, char* option_name, TestCLParser& parser,
     PAParamsPtr& act, bool& using_range, Range<uint64_t>& range,
+    PAParamsPtr& exp)
+    PAParamsPtr& act, bool& using_range, Range<uint64_t>& range,
     size_t* max_threads)
     PAParamsPtr& act, bool& using_range, Range<uint64_t>& range,
     size_t* max_threads)