From: Nathaniel Wesley Filardo Date: Tue, 30 Oct 2018 22:38:51 +0000 (+0000) Subject: Small changes to semigenerated files X-Git-Tag: release-1.2~1 X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=b2e6cc26dcb0469a02ec3f3ed3c1dd83de8e962e;p=acmetensortoys-ctfws-android Small changes to semigenerated files --- diff --git a/mobile/build.gradle b/mobile/build.gradle index e858977..af3abc3 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -45,7 +45,7 @@ repositories { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation ('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml index 069bcd9..0a91981 100644 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -4,7 +4,8 @@ - + + @@ -24,9 +25,9 @@ - + diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml index 59eaa5b..07ed72a 100644 --- a/mobile/src/main/res/values/strings.xml +++ b/mobile/src/main/res/values/strings.xml @@ -42,6 +42,7 @@ Handbook Settings Quit + Reconnect Server URI: Server State: @@ -75,7 +76,6 @@ ]]> - Reconnect Terribly sorry, something has gone wrong. Please try loading the