From 4ee9000059668a863e1b1a2f658b0b1433660ede Mon Sep 17 00:00:00 2001
From: Tim Martinak <tmartinak@paypal.com>
Date: Tue, 15 Oct 2024 09:54:59 -0400
Subject: [PATCH] Fix missed merge conflict in .gitignore

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

diff --git a/.gitignore b/.gitignore
index b5cadc83..c889f486 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,7 +101,6 @@ dist
 .tern-port
 
 # dotnet
-<<<<<<< HEAD
 *.sln
 
 # env