From 9f85ec639d0c8324919dcfa1deac2a8f1ac93075 Mon Sep 17 00:00:00 2001
From: greysoh <me@greysoh.dev>
Date: Fri, 2 Aug 2024 17:36:08 -0400
Subject: [PATCH] fix: Removes artifacts from .gitignore.

Oops.
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b719b51..98573b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ __pycache__
 .server-setup
 .env
 out
-<<<<<<< HEAD
 
 # kubernetes/
 build.log