'解决冲突'

2021-06-15 18:52:03 +08:00
parent 84b4eaca1e 128e55a4f7
commit 24ed256033
11 changed files with 38 additions and 9 deletions
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -68,8 +68,6 @@
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
-
-
 <!--    <LinearLayout-->
 <!--        android:id="@+id/ll_iv"-->
 <!--        android:layout_width="match_parent"-->
@@ -189,7 +187,9 @@
        <!--                android:textSize="10sp"-->
        <!--                android:text="SNAP"/>-->
        <!--        </LinearLayout>-->
+
 <!--    </LinearLayout>-->


+
 </androidx.constraintlayout.widget.ConstraintLayout>