From 73cfe1e1cd900431ac9baa4b9a061f76239d2caa Mon Sep 17 00:00:00 2001
From: turtlebasket <turtlebasket@gmail.com>
Date: Wed, 14 Jun 2023 13:53:23 -0700
Subject: [PATCH] remove another merge msg from gitignore

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

diff --git a/.gitignore b/.gitignore
index 48f26a4..25d9d5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,11 +92,7 @@ DocProject/Help/Html2
 DocProject/Help/html
 
 # Cmake, make and compiled objects on unix
-<<<<<<< HEAD
 #*.cmake
-=======
-*.cmake
->>>>>>> master
 *.c.o
 */CMakeFiles/*
 */Makefile
@@ -146,20 +142,6 @@ Assets/AssetStoreTools*
 # Visual Studio cache directory
 .vs/
 
-<<<<<<< HEAD
-=======
-# Visual Studio Code cache directory
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
-
-# Local History for Visual Studio Code
-.history/
-
->>>>>>> master
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
 .consulo/