From fbf2c7a7431b5ee8dbf9e3046fd22ec254f7cfd8 Mon Sep 17 00:00:00 2001
From: BO41 <lukasw41@gmail.com>
Date: Wed, 12 Sep 2018 11:47:17 +0200
Subject: [PATCH] resolve conflicts

---
 .../newpipe/extractor/channel/ChannelInfoItemExtractor.java    | 3 ++-
 .../youtube/extractors/YoutubeChannelInfoItemExtractor.java    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java
index 5b58ac03b..357917053 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java
@@ -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();
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelInfoItemExtractor.java
index ad6ecb642..1a61f943a 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelInfoItemExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelInfoItemExtractor.java
@@ -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;
 
 /*