diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2013-08-16 20:15:48 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2013-08-16 20:15:48 +0200 |
commit | f6c5251b98b5ae1bc31a1d1940530174588c3e27 (patch) | |
tree | ce31e7712455739b5e3149c2607b712763a375b2 /res/layout/feedlist.xml | |
parent | d94e2a7670f20b60ef42435753da118b364fdbab (diff) | |
parent | 3994d02ddfb52a4418951a22bb72f55f85a76fbb (diff) | |
download | AntennaPod-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.xml | 4 |
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 |