Merge branch 'main' of github.com:Ctri-The-Third/ServiceHelpers

Ctri-The-Third · Mar 17, 2022 · 830a36c · 830a36c
2 parents 2462130 + 8cfeeb0
commit 830a36c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/freshdesk.py b/freshdesk.py
@@ -151,7 +151,10 @@ def get_worklogs(self,ticketID):
 
 
             url = 'https://%s/api/v2/tickets/%s/time_entries' % (self.host,ticketID)
+<<<<<<< HEAD
+=======
 
+>>>>>>> 9251d5b9adf5e5c462589e7ef30ed9343ab8f572
             AuthString = "Basic %s" % (self.api_key) 
             r = requests.get (
                 url,