From 6420268cb87bf4e5be8d23a15591a20743f5ff06 Mon Sep 17 00:00:00 2001
From: Georgi Gerganov <ggerganov@gmail.com>
Date: Fri, 30 Aug 2024 11:12:41 +0300
Subject: [PATCH] llama-cli : resolve conflict

ggml-ci
---
 examples/main/main.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/examples/main/main.cpp b/examples/main/main.cpp
index 22941eb3d2bb6..1da9dba6572ce 100644
--- a/examples/main/main.cpp
+++ b/examples/main/main.cpp
@@ -243,9 +243,6 @@ int main(int argc, char ** argv) {
     }
 
     llama_attach_threadpool(ctx, threadpool, threadpool_batch);
-    if (ctx_guidance) {
-        llama_attach_threadpool(ctx_guidance, threadpool, threadpool_batch);
-    }
 
     const int n_ctx_train = llama_n_ctx_train(model);
     const int n_ctx = llama_n_ctx(ctx);