fixed vertical spacing in the lock manager

OliverLok · May 29, 2024 · dcc20b9 · dcc20b9
1 parent bc2893e
commit dcc20b9
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/common/lockmanager.go b/common/lockmanager.go
@@ -60,9 +60,7 @@ func lock(key string, read bool) {
     }
 
     lock.lockCount++;
-<<<<<<< HEAD
-=======
->>>>>>> upstream/main
+
     lock.timestamp = time.Now();
 }
 
@@ -89,9 +87,7 @@ func unlock(key string, read bool) error {
     }
 
     lock.lockCount--;
-<<<<<<< HEAD
-=======
->>>>>>> upstream/main
+
     lock.timestamp = time.Now();
 
     return nil;