diff options
| author | orionlee <orionlee@yahoo.com> | 2019-04-06 14:19:16 -0700 |
|---|---|---|
| committer | orionlee <orionlee@yahoo.com> | 2019-04-06 14:19:16 -0700 |
| commit | 20f1445c067aef2b9d9b8cb0f4b2d0019e3f34a0 (patch) | |
| tree | 5c4b55822f4855f0f5c495af9067585b179a34fd /core/src/main/java/de | |
| parent | c04f340ae26e88e360f2410cc14e2eeb689051e7 (diff) | |
| download | AntennaPod-20f1445c067aef2b9d9b8cb0f4b2d0019e3f34a0.zip | |
fix rebase conflicts - remove the incorrect @NonNull from rxjava
Diffstat (limited to 'core/src/main/java/de')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java index 45dac4c53..f7226729a 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java @@ -49,7 +49,6 @@ import de.danoeh.antennapod.core.util.flattr.FlattrStatus; import de.danoeh.antennapod.core.util.flattr.FlattrThing; import de.danoeh.antennapod.core.util.flattr.SimpleFlattrThing; import de.greenrobot.event.EventBus; -import io.reactivex.annotations.NonNull; /** * Provides methods for writing data to AntennaPod's database. |