From dcc20b9214b324c088c084bfe6174731f70b3f65 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.lokhandwala@gmail.com>
Date: Tue, 28 May 2024 17:03:07 -0700
Subject: [PATCH] fixed vertical spacing in the lock manager

---
 common/lockmanager.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/common/lockmanager.go b/common/lockmanager.go
index 9cea342c..6473170c 100644
--- 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;