From 3f171c80ebf74c49c894f2e951dfc06b1016ff13 Mon Sep 17 00:00:00 2001
From: Sarthak Aggarwal <sarthagg@amazon.com>
Date: Fri, 10 Jan 2025 11:43:09 -0800
Subject: [PATCH] resolving conflicts and clang formats

Signed-off-by: Sarthak Aggarwal <sarthagg@amazon.com>
---
 src/networking.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/networking.c b/src/networking.c
index 6e6d6ecd1d..c00b4462df 100644
--- a/src/networking.c
+++ b/src/networking.c
@@ -3901,7 +3901,7 @@ void clientCommandTracking(client *c) {
     struct ClientFlags options = {0};
     robj **prefix = NULL;
     size_t numprefix = 0;
-        initClientPubSubData(c);
+    initClientPubSubData(c);
 
     /* Parse the options. */
     for (int j = 3; j < c->argc; j++) {