From ae67067641f385a876b3b7f6c71e79fbc0cbce19 Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Wed, 10 Jan 2024 15:35:58 +0100
Subject: [PATCH] resolve metadata conflicts

---
 resources/metadata.scale | Bin 132114 -> 132253 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/resources/metadata.scale b/resources/metadata.scale
index 7f579695264b0823a205907a6cfb8014e4f750cd..86dc5fa76adcc7628a8dd62903866e06603f0719 100644
GIT binary patch
delta 165
zcmbQ#!7;a!qhSl<`L~Qb(=WVbw5#{<O{@q?O-n6GO?AmEE=kNwP8ASfWnf_7c%a~$
zSdp1qnyZikl~5=xPEAoL$yZ28P0P$nRVae!Q!iFXOioTMF3wEK%*iaNyrU4B2UeL>
zsZdm!SCW~Vs*qG#qL7!Gnv$BLkW{IVoRgWFR{}DZ2W+E4eo<m_PU?2PcZ@7z0O?;m
Ap#T5?

delta 24
gcmbQ+$uX&eqhSl<`L~Q5(=WVbwA()O9V3ev0EJZwHvj+t

-- 
GitLab