From 9b7c1aee0a395b1d102f5adaf0e1a67d87b9cfbe Mon Sep 17 00:00:00 2001
From: Adrian Davila <a4davila@uwaterloo.ca>
Date: Fri, 29 Dec 2023 12:14:43 -0500
Subject: [PATCH] fix merge issue

---
 ortoa-lbl/Operation.thrift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ortoa-lbl/Operation.thrift b/ortoa-lbl/Operation.thrift
index 4f2f2cc9..170e0845 100644
--- a/ortoa-lbl/Operation.thrift
+++ b/ortoa-lbl/Operation.thrift
@@ -7,4 +7,4 @@ struct Operation {
 
 service Send_Op {
   binary access(1:Operation operation),
-}
\ No newline at end of file
+}