From fdb846c4fae7f0b4d9b7be0946d945b53e9b2e43 Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@kartoza.com>
Date: Wed, 5 Mar 2025 22:38:43 +0000
Subject: [PATCH] Fix gitignore

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

diff --git a/.gitignore b/.gitignore
index 5a77e05527b..749f5a6b2c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-.vscode
-.vscode-extensions
 testdata
 sphinx-env
 *.pyc
@@ -27,11 +25,11 @@ venv
 .venv
 user.mk
 .vscode
-<<<<<<< HEAD
 shell.nix
 vscode.sh
 clean.sh
 .envrc
 .vscode-extensions
+.vscode
 core
 .env