diff options
| author | Thomas <tschneider.ac@gmail.com> | 2020-05-17 18:33:37 +0200 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2020-05-17 18:33:37 +0200 |
| commit | d6e73438115923699127ab8abb840728259e56b7 (patch) | |
| tree | 9258d70188b6e93eb1546b9473170e3331ccd0c8 /app/src/main/res/layout/activity_webview.xml | |
| parent | 4647167d27267caf097e89bbcb06577ff1d8a548 (diff) | |
| parent | ea824daa6d81e412851544867327ac0c05c1177e (diff) | |
Merge branch 'develop'
# Conflicts:
# app/build.gradle
Diffstat (limited to 'app/src/main/res/layout/activity_webview.xml')
| -rw-r--r-- | app/src/main/res/layout/activity_webview.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml index a225f1903..b57f7b9f9 100644 --- a/app/src/main/res/layout/activity_webview.xml +++ b/app/src/main/res/layout/activity_webview.xml @@ -29,7 +29,7 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="10dp" - android:padding="1dp"/> + android:padding="1dp" /> <FrameLayout android:id="@+id/webview_container" |