From 08d6f0cf28940e9d50a91e3b0befe2e13fdc6d6c Mon Sep 17 00:00:00 2001
From: Anthony Geourjon <anthony.geourjon@tetras-libre.fr>
Date: Thu, 28 Dec 2023 15:20:47 +0100
Subject: [PATCH] Fix merge

---
 .gitignore | 3 ++-
 mirador    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 866ea4a..c3e6fb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
 /umd
 npm-debug.log*
 .idea
-
+.package-lock.json
+```
diff --git a/mirador b/mirador
index 3e696d6..3def696 160000
--- a/mirador
+++ b/mirador
@@ -1 +1 @@
-Subproject commit 3e696d63f5425975a23435e8c25eada9bb42542d
+Subproject commit 3def696e0a9014bbfb444a6770533771492c2d26
-- 
GitLab