From cb92934b7c4df2e4041ddf59f81b640eefe97d1e Mon Sep 17 00:00:00 2001
From: Laurent Piron <lpiron@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:13:49 +0200
Subject: [PATCH] Update .gitignore

conflicts resolutions
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 88edab1..8486f06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 # The output directory contains the build output. This is not checked in to source control.
 Output
 dist/
-.$images.drawio.bkp