fix after merge

Commit zendesk changes
Ctri-The-Third · Mar 16, 2022 · 9251d5b · 9251d5b
1 parent 9ee3028
commit 9251d5b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/freshdesk.py b/freshdesk.py
@@ -150,20 +150,8 @@ def get_worklogs(self,ticketID):
             currentPage = currentPage + 1
 
 
-            url = 'https://%s/api/v2/tickets/%s/time_entries' % (cfg.FreshdeskURL,ticketID)
-<<<<<<< HEAD
-=======
             url = 'https://%s/api/v2/tickets/%s/time_entries' % (self.host,ticketID)
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> fdd761b... Update freshdesk.py
-=======
->>>>>>> c572659... merged changes
-=======
->>>>>>> 56434b82345af16009679b9043d8a29b4711b355
->>>>>>> ee9951f (Revert "merged changes")
-=======
->>>>>>> aa5e9fa (Revert "merge resolution")
+
             AuthString = "Basic %s" % (self.api_key) 
             r = requests.get (
                 url,

diff --git a/zendesk.py b/zendesk.py
@@ -3,9 +3,6 @@
 import logging 
 import requests
 import re 
-import helpers.TrelloHelper as TrelloHelper
-import helpers.cfg as cfg
-