resolve conflicts
This commit is contained in:
parent
9848acbc55
commit
fbf2c7a743
|
@ -1,6 +1,7 @@
|
|||
package org.schabi.newpipe.extractor.channel;
|
||||
|
||||
import org.schabi.newpipe.extractor.InfoItemExtractor;
|
||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||
|
||||
/*
|
||||
* Created by Christian Schabesberger on 12.02.17.
|
||||
|
@ -25,6 +26,6 @@ import org.schabi.newpipe.extractor.InfoItemExtractor;
|
|||
public interface ChannelInfoItemExtractor extends InfoItemExtractor {
|
||||
String getDescription();
|
||||
|
||||
long getSubscriberCount();
|
||||
long getSubscriberCount() throws ParsingException;
|
||||
long getStreamCount();
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@ package org.schabi.newpipe.extractor.services.youtube.extractors;
|
|||
|
||||
import org.jsoup.nodes.Element;
|
||||
import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
|
||||
import org.schabi.newpipe.extractor.exceptions.ParsingException;
|
||||
import org.schabi.newpipe.extractor.utils.Utils;
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue