diff options
Diffstat (limited to 'src/Watcher/time_operations.py')
| -rwxr-xr-x | src/Watcher/time_operations.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/Watcher/time_operations.py b/src/Watcher/time_operations.py index b7d3224..1df4922 100755 --- a/src/Watcher/time_operations.py +++ b/src/Watcher/time_operations.py @@ -14,10 +14,6 @@ def time_difference(a,b): # b - a mn = 60 + mn if hr < 0: hr = hr + 24 -<<<<<<< HEAD - -======= ->>>>>>> afk_feature elif sec < 0 and mn > 0: sec = 60 + sec mn = mn - 1 |