From d4e144223a7f579c38e272bf2880d1d0a2259087 Mon Sep 17 00:00:00 2001
From: Thierry Charbonnel <thierryc@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:24:04 -0400
Subject: [PATCH] fix conflict

---
 assets/svg/1f1f2-1f1f6.svg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/assets/svg/1f1f2-1f1f6.svg b/assets/svg/1f1f2-1f1f6.svg
index 4da981a5..fa4403f4 100644
--- a/assets/svg/1f1f2-1f1f6.svg
+++ b/assets/svg/1f1f2-1f1f6.svg
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
 <svg viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="nonzero"><path d="m0 18v9c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-9l-6-5h-24z" fill="#231f1e"/><path d="m36 18v-9c0-2.209-1.791-4-4-4h-28c-2.209 0-4 1.791-4 4v9z" fill="#00a650"/><path d="m1.351 6.004h-.001c-.828.733-1.35 1.804-1.35 2.996v18c0 1.193.522 2.264 1.351 2.997l16.149-11.997z" fill="#ef1923"/></g></svg>
-=======
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M7.10542736e-15,18 L7.10542736e-15,27 C7.10542736e-15,29.209 1.791,31 4,31 L32,31 C34.209,31 36,29.209 36,27 L36,18 L7.10542736e-15,18 Z" fill="#231F1E"></path><path d="M36,18 L36,9 C36,6.791 34.209,5 32,5 L4,5 C1.791,5 7.10542736e-15,6.791 7.10542736e-15,9 L7.10542736e-15,18 L36,18 Z" fill="#00A650"></path><path d="M1.351,6.004 L1.35,6.004 C0.522,6.737 7.10542736e-15,7.808 7.10542736e-15,9 L7.10542736e-15,27 C7.10542736e-15,28.193 0.522,29.264 1.351,29.997 L17.5,18 L1.351,6.004 Z" fill="#EF1923"></path></svg>
->>>>>>> Stashed changes