From 75bb3e4a3451401597f7f9ae921a9b398e1690c1 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 25 Jan 2025 09:48:58 -0800 Subject: [PATCH] Resolve conflict: update .mo from master + ignore --- locale/en_US/LC_MESSAGES/messages.mo | Bin 44147 -> 43019 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 5706506b09ab0bc1f31855a381f403e9f90179fa..d1c38e1f3fe2e4aea23d38c09db8dde0ac69c255 100644 GIT binary patch delta 11525 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 delta 12553 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