From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突

---
 gradle.properties |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d5ff165..a4bc7ac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,3 +21,8 @@
 android.nonTransitiveRClass=true
 
 android.injected.testOnly=false
+
+KEY_PATH=zhangshiapp.keystore
+KEY_PASS=123456
+ALIAS_NAME=alias
+ALIAS_PASS=123456

--
Gitblit v1.9.1