.

Author: benjhar

jokeapi/main.py

@@ -81,14 +81,10 @@ def build_request(
                 search_string = urllib.parse.quote(search_string)
         if id_range:
 
-<<<<<<< HEAD
             response = self.http.request(
                                         'GET',
                                         "https://sv443.net/jokeapi/v2/info"
                                         )
-=======
-            response = self.http.request('GET', "https://sv443.net/jokeapi/v2/info")
->>>>>>> adf582966ed869e69c96a36f963ea2a4ac76e55b
             dict = json.loads(response.data)
             range_limit = dict["jokes"]["totalCount"]