resolves merge conflict

This commit is contained in:
Vavassor 2017-05-07 20:20:59 -04:00
commit daf0ec8e49
7 changed files with 180 additions and 14 deletions

View file

@ -72,6 +72,7 @@
<activity android:name=".PreferencesActivity" />
<activity android:name=".FavouritesActivity" />
<activity android:name=".AccountListActivity" />
<activity android:name=".AboutActivity" />
<activity
android:name=".ReportActivity"
android:windowSoftInputMode="stateVisible|adjustResize" />