aboutsummaryrefslogtreecommitdiff
path: root/src/Watcher/time_operations.py
diff options
context:
space:
mode:
authorLibravatar Waishnav <waishnavdeore@gmail.com>2022-07-09 07:54:06 +0530
committerLibravatar Waishnav <waishnavdeore@gmail.com>2022-07-09 07:54:06 +0530
commitf38fa81c08795f3160fd1c0320840a5ec931304e (patch)
treed5f4ad786da3f410024f49cf1c69a91e11dd143b /src/Watcher/time_operations.py
parentf0e484878af5b86b723de6af5f506f8b18e66ddc (diff)
downloadshopno-os-log-sync-f38fa81c08795f3160fd1c0320840a5ec931304e.tar.gz
shopno-os-log-sync-f38fa81c08795f3160fd1c0320840a5ec931304e.zip
fixing typo | changing some time.sleep() values so that low CPU will consume
Diffstat (limited to '')
-rwxr-xr-xsrc/Watcher/time_operations.py4
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