From fb8ddc564ebd43539caf90579c798bfe525468e1 Mon Sep 17 00:00:00 2001
From: Hyden Liu <sunupdong@gmail.com>
Date: Tue, 7 May 2024 01:32:30 +0800
Subject: [PATCH] chore: delete `HEAD` (#4194)

---
 docs/windows.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/windows.md b/docs/windows.md
index 72c5d32c1..242b810ab 100644
--- a/docs/windows.md
+++ b/docs/windows.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Ollama Windows Preview
 
 Welcome to the Ollama Windows preview.
@@ -59,4 +58,4 @@ If you'd like to install or integrate Ollama as a service, a standalone
 `ollama-windows-amd64.zip` zip file is available containing only the Ollama CLI
 and GPU library dependencies for Nvidia and AMD. This allows for embedding
 Ollama in existing applications, or running it as a system service via `ollama
-serve` with tools such as [NSSM](https://nssm.cc/).
\ No newline at end of file
+serve` with tools such as [NSSM](https://nssm.cc/).