remove another merge msg from gitignore

.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/