Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

resolve conflict

Browse source
This commit is contained in:
Christian Schabesberger 2018-01-20 18:06:34 +01:00
commit 04d0ae44c5
9 changed files with 115 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/xml/content_settings.xml
View file

@ -2,7 +2,6 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/content">
<ListPreference
android:defaultValue="@string/default_country_value"
android:entries="@array/country_names"
@ -38,5 +37,4 @@
android:key="@string/main_page_content_key"
android:title="@string/main_page_content"
android:summary="%s"/>
</PreferenceScreen>