diff --git a/.eslintrc.json b/.eslintrc.json index 0d0323071..229d31473 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -61,6 +61,7 @@ "afterColon": true }}], "@typescript-eslint/member-delimiter-style": 2, + "@typescript-eslint/no-unsafe-declaration-merging": "off", "import/order": [ 2, { diff --git a/.solidarity b/.solidarity index 5ad4be2b1..98568a68b 100644 --- a/.solidarity +++ b/.solidarity @@ -57,7 +57,7 @@ { "rule": "cli", "binary": "pod", - "semver": "1.11.3", + "semver": "1.12.1", "platform": "darwin" } ], diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml index bb6f578c3..ab58c0f44 100644 --- a/android/app/src/main/res/drawable/rn_edit_text_material.xml +++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -16,7 +16,7 @@ android:insetTop="@dimen/abc_edit_text_inset_top_material" android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"> -