From a3e13f5daccba586a4c19174caad510981f35db0 Mon Sep 17 00:00:00 2001
From: Arthur Puechberty <arthur.puechberty@outlook.com>
Date: Thu, 15 Jan 2026 00:01:31 +0100
Subject: [PATCH] Merge remote

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index dc5415a..76fb994 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,4 +138,7 @@ dist
 
 # Vite logs files
 vite.config.js.timestamp-*
+<<<<<<< HEAD
+vite.config.ts.timestamp-*
+=======
 vite.config.ts.timestamp-*
\ No newline at end of file