From dcdeca1471624df8fe94d22c61172b30ea1d87c7 Mon Sep 17 00:00:00 2001
From: Devrim Yasar <devrim@noreply.luckyrobots.com>
Date: Sat, 5 Apr 2025 12:10:49 +0000
Subject: [PATCH] Update .gitignore

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1452265e..ba220b1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,11 +38,7 @@ BP_Revolute
 # Precompiled Assets
 SourceArt/**/*.png
 SourceArt/**/*.tga
-<<<<<<< HEAD
 
-
-=======
->>>>>>> main
 # Builds
 Build/*
 Builds/*