summaryrefslogtreecommitdiff
path: root/res/layout/feedlist.xml
diff options
context:
space:
mode:
authordaniel oeh <daniel.oeh@gmail.com>2013-08-16 20:15:48 +0200
committerdaniel oeh <daniel.oeh@gmail.com>2013-08-16 20:15:48 +0200
commitf6c5251b98b5ae1bc31a1d1940530174588c3e27 (patch)
treece31e7712455739b5e3149c2607b712763a375b2 /res/layout/feedlist.xml
parentd94e2a7670f20b60ef42435753da118b364fdbab (diff)
parent3994d02ddfb52a4418951a22bb72f55f85a76fbb (diff)
downloadAntennaPod-f6c5251b98b5ae1bc31a1d1940530174588c3e27.zip
Merge branch 'develop' into playback-speed
Conflicts: pom.xml src/de/danoeh/antennapod/service/PlaybackService.java src/de/danoeh/antennapod/util/playback/PlaybackController.java
Diffstat (limited to 'res/layout/feedlist.xml')
-rw-r--r--res/layout/feedlist.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/res/layout/feedlist.xml b/res/layout/feedlist.xml
index b88e2eb6e..0557d8aea 100644
--- a/res/layout/feedlist.xml
+++ b/res/layout/feedlist.xml
@@ -15,7 +15,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:layout_gravity="center"
- android:text="@string/no_feeds_label" />
-
+ android:layout_gravity="center"/>
</LinearLayout> \ No newline at end of file