From 6f857af606eaf0c96beb83f0974f73dc60b1d887 Mon Sep 17 00:00:00 2001
From: soralit <soralitria@gmail.com>
Date: Tue, 8 Oct 2024 18:42:47 +0800
Subject: [PATCH] chore: resolve conflicts

---
 src/ui/gui_assets/images_hash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/gui_assets/images_hash.txt b/src/ui/gui_assets/images_hash.txt
index 82b5c6112..708604a0e 100644
--- a/src/ui/gui_assets/images_hash.txt
+++ b/src/ui/gui_assets/images_hash.txt
@@ -1 +1 @@
-c54161aab3760326750a3d88c6820e93
+31469a0c1a71601eb020fd11c6babf1b
\ No newline at end of file