From e4e28c1c4621bcce07b88c6a07ba9e829cefa8bb Mon Sep 17 00:00:00 2001
From: jianyuzh <jianyu.zhang@intel.com>
Date: Thu, 1 Feb 2024 22:31:41 +0800
Subject: [PATCH] fix conflict

---
 examples/llama-bench/llama-bench.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/llama-bench/llama-bench.cpp b/examples/llama-bench/llama-bench.cpp
index edd0dc253..b8e465e8e 100644
--- a/examples/llama-bench/llama-bench.cpp
+++ b/examples/llama-bench/llama-bench.cpp
@@ -196,8 +196,8 @@ static const cmd_params cmd_params_defaults = {
     /* no_kv_offload */ {false},
     /* mul_mat_q     */ {true},
     /* tensor_split  */ {std::vector<float>(llama_max_devices(), 0.0f)},
-    /* reps          */ 5,
     /* use_mmap      */ true,
+    /* reps          */ 5,
     /* verbose       */ false,
     /* output_format */ MARKDOWN
 };