Potential fix for pull request finding

This just makes the wording more accurate

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

server: auto-insert missing media markers in process_mtmd_prompt

Fixes the /embedding endpoint when multimodal data is provided without
corresponding media markers in the prompt string. Counts existing markers
and prepends only the missing number so the count matches files.size().

Assisted-by: GitHub Copilot

Author: TheOneWhoWill

tools/server/server-common.cpp

@@ -716,8 +716,12 @@ server_tokens process_mtmd_prompt(mtmd_context * mctx, const std::string & promp
     }
 
     // prepend missing markers so the count matches the number of files
+<<<<<<< HEAD
+    // this mirrors the behavior in mtmd-cli.cpp, but also handles prompts that already contain some markers
+=======
     // this mirrors the behavior in mtmd-cli.cpp but also handles partial matches
     if (n_markers < files.size()) {
+>>>>>>> 327c5a188 (server: auto-insert missing media markers in process_mtmd_prompt)
         for (size_t i = 0; i < files.size() - n_markers; i++) {
             prompt_adj += marker;
         }