From 30ef17a4be70681a4e6acef12325f493bcee1c4e Mon Sep 17 00:00:00 2001
From: xufei <xufeixw@mail.ustc.edu.cn>
Date: Thu, 16 Jun 2022 13:56:29 +0800
Subject: [PATCH] resolve conflict

Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
---
 contrib/client-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/client-c b/contrib/client-c
index 9674d9aedf5..184cde7ae4f 160000
--- a/contrib/client-c
+++ b/contrib/client-c
@@ -1 +1 @@
-Subproject commit 9674d9aedf5d5e0e518ad41f9a2d5a25ff892005
+Subproject commit 184cde7ae4f83c0e9aaaaf825f3e0e7d600e62fa