From 9340c251494183c37ee883f515525c91debe31e6 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 27 Dec 2025 11:37:38 +0100
Subject: [PATCH] merge gitignore

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

diff --git a/.gitignore b/.gitignore
index 9560e8f5f..affc88c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,10 +47,6 @@ local/*
 .idea/*
 include/tfpdf/font/unifont/*
 html/ads.html
-<<<<<<< HEAD
-/nbproject/private/
-=======
 doc/code/*
 nbproject/private/
 
->>>>>>> unstable