From dccbcc48a583eb38b4bc5b459d417087826846ac Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期三, 12 四月 2023 18:06:29 +0800
Subject: [PATCH] resolve conflict

---
 LICENSE |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/LICENSE b/LICENSE
index 3f0f5bf..303aaf8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -18,4 +18,4 @@
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
\ No newline at end of file

--
Gitblit v1.9.1