diff options
| author | Martin Fietz <martin.fietz@gmail.com> | 2018-01-21 11:10:20 +0100 |
|---|---|---|
| committer | Martin Fietz <martin.fietz@gmail.com> | 2018-01-21 11:10:20 +0100 |
| commit | d3491d1858bf33f894f07652169254b5821b0e9d (patch) | |
| tree | 74449084cd33cdcdf9a2c04291ba5c9d36defffb /app/src/main/java/de/danoeh/antennapod/dialog | |
| parent | e4770e7edce8116f764fdb748cb3d4252c91b8dd (diff) | |
| parent | f7c048e5b4717a997c26be42332395dc3b0f6f02 (diff) | |
| download | AntennaPod-d3491d1858bf33f894f07652169254b5821b0e9d.zip | |
Merge branch 'develop' into refactor
# Conflicts:
# app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
# core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/dialog')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java index 04d4ae247..10ce12771 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java @@ -32,7 +32,7 @@ import de.danoeh.antennapod.core.util.LongList; public class EpisodesApplyActionFragment extends Fragment { - public String TAG = "EpisodeActionFragment"; + public static final String TAG = "EpisodeActionFragment"; private static final int ACTION_QUEUE = 1; private static final int ACTION_MARK_PLAYED = 2; |