resolve conflicts

This commit is contained in:
BO41 2018-09-12 11:47:17 +02:00
parent 9848acbc55
commit fbf2c7a743
2 changed files with 3 additions and 1 deletions

View File

@ -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();
}

View File

@ -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;
/*