pre tokenizer merge fix

Author: ryan-mangeno

src/llama-vocab.cpp

@@ -1667,14 +1667,8 @@ void llama_vocab::impl::load(llama_model_loader & ml, const LLM_KV & kv) {
                 pre_type = LLAMA_VOCAB_PRE_TYPE_SEED_CODER;
                 clean_spaces = false;
             } else if (
-<<<<<<< HEAD
                 tokenizer_pre == "hunyuan") {
                 pre_type = LLAMA_VOCAB_PRE_TYPE_HUNYUAN;
-=======
-                tokenizer_pre == "smoldocling") {
-                pre_type = LLAMA_VOCAB_PRE_TYPE_SMOLDOCLING;
->>>>>>> 61cfad02 (support for smoldocling)
-                clean_spaces = false;
             } else if (
                 tokenizer_pre == "smoldocling") {
                 pre_type = LLAMA_VOCAB_PRE_TYPE_SMOLDOCLING;