Fix missed merge conflict in .gitignore

Tim Martinak · Tim Martinak · commit 4ee900005966 · 2024-10-15T09:54:59.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -101,7 +101,6 @@ dist
 .tern-port
 
 # dotnet
-<<<<<<< HEAD
 *.sln
 
 # env
