Merge remote-tracking branch 'origin/master'

b43bb15b · 陈前 · f8c9f8a9 · 744ebfb9 · b43bb15b
Commit b43bb15b authored Jan 30, 2018 by 陈前
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/src/main/res/layout/activity_send_ticket.xml app/src/main/res/layout/activity_send_ticket.xml +0 -1

No files found.
--- a/app/src/main/res/layout/activity_send_ticket.xml
+++ b/app/src/main/res/layout/activity_send_ticket.xml
@@ -20,7 +20,6 @@

        <FrameLayout
            android:id="@+id/fragment"
-            style="@style/xuline_margin"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_gravity="center"