From f5d87a5a585adcbb148dee6c62ff6e18c4e7334c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 14:36:40 +0800
Subject: [PATCH] conflect

---
 src/main/resources/i18n/messages_en_US.properties |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index da67cfb..b3ce513 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -261,3 +261,5 @@
 
 unknown_type=Unknown type
 
+loading_type=loading
+

--
Gitblit v1.9.1