fix rebase conflicts - remove the incorrect @NonNull from rxjava
This commit is contained in:
parent
c04f340ae2
commit
20f1445c06
|
@ -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.FlattrThing;
|
||||||
import de.danoeh.antennapod.core.util.flattr.SimpleFlattrThing;
|
import de.danoeh.antennapod.core.util.flattr.SimpleFlattrThing;
|
||||||
import de.greenrobot.event.EventBus;
|
import de.greenrobot.event.EventBus;
|
||||||
import io.reactivex.annotations.NonNull;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides methods for writing data to AntennaPod's database.
|
* Provides methods for writing data to AntennaPod's database.
|
||||||
|
|
Loading…
Reference in New Issue