From b6669326b4a275740a81b042e20cc4530671183d Mon Sep 17 00:00:00 2001
From: Jun Ouyang <ouyangjun1999@gmail.com>
Date: Sun, 29 Sep 2024 20:19:46 +0800
Subject: [PATCH] fix code

---
 .requirements | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.requirements b/.requirements
index 86a6cda95233..067780d6b18d 100644
--- a/.requirements
+++ b/.requirements
@@ -15,11 +15,15 @@ LIBEXPAT_SHA256=d4cf38d26e21a56654ffe4acd9cd5481164619626802328506a2869afab29ab3
 
 # Note: git repositories can be loaded from local path if path is set as value
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 LUA_KONG_NGINX_MODULE=3eb89666f84348fa0599d4e0a29ccf89511e8b75 # 0.13.0
 LUA_RESTY_LMDB=890b3caf45bd052e319e48349ef393ec93e08ac4 # 1.5.0
 =======
 LUA_KONG_NGINX_MODULE=61f5061cb5a8ce0ceb96f553f933c90b143d97e3 # 0.11.0
+=======
+LUA_KONG_NGINX_MODULE=147cc4edc36a23acb21c2eaefff3e373a37c3221 # 0.11.0
+>>>>>>> 4e0e15f54 (fix code)
 LUA_RESTY_LMDB=5016b110dfc0e0a7a2742c63a6c922d5c7d75218 # 1.4.3
 >>>>>>> d72e077de (fix code)
 LUA_RESTY_EVENTS=2dcd1d7a256c53103c0fdbe804f419174e0ea8ba # 0.3.0