resolves merge conflict
This commit is contained in:
commit
daf0ec8e49
7 changed files with 180 additions and 14 deletions
|
|
@ -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" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue