merge stabilisation

Ctri-The-Third · Mar 18, 2022 · 06aefe2 · 06aefe2
1 parent 22c9d0b
commit 06aefe2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/freshdesk.py b/freshdesk.py
@@ -151,10 +151,6 @@ 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,