From a780f0b8d0ccec90d359c0c554f07d5afde9554c Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 28 六月 2022 17:05:31 +0800
Subject: [PATCH] 代码同步
---
HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml b/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
index 8a12f46..e7a4301 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
+++ b/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
@@ -27,9 +27,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
+<<<<<<< HEAD
android:inputType="number"
android:text="1539852889620406274"
/>
+=======
+ android:text="A583853817423247" />
+>>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
<Button
android:id="@+id/login_btn"
--
Gitblit v1.8.0