From 765a4869b8ac4dd0573afba2d04b6a03ac332f6b Mon Sep 17 00:00:00 2001
From: Uri Yagelnik <uriy@amazon.com>
Date: Mon, 6 Jan 2025 11:18:43 +0000
Subject: [PATCH] Fix merge conflict

Signed-off-by: Uri Yagelnik <uriy@amazon.com>
---
 src/module.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/module.h b/src/module.h
index 7785fc0d4f..f4e4de67eb 100644
--- a/src/module.h
+++ b/src/module.h
@@ -228,7 +228,6 @@ int moduleLateDefrag(robj *key, robj *value, unsigned long *cursor, monotime end
 void moduleDefragGlobals(void);
 void *moduleGetHandleByName(char *modulename);
 int moduleIsModuleCommand(void *module_handle, struct serverCommand *cmd);
-void initClientModuleData(client *c);
 void freeClientModuleData(client *c);
 
 #endif /* _MODULE_H_ */