fix code

Kong · Oct 21, 2024 · 71b4f35 · 71b4f35
1 parent a9a5fb4
commit 71b4f35
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.requirements b/.requirements
@@ -15,8 +15,13 @@ LIBEXPAT_SHA256=d4cf38d26e21a56654ffe4acd9cd5481164619626802328506a2869afab29ab3
 
 # Note: git repositories can be loaded from local path if path is set as value
 
+<<<<<<< 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_RESTY_LMDB=5016b110dfc0e0a7a2742c63a6c922d5c7d75218 # 1.4.3
+>>>>>>> d72e077de (fix code)
 LUA_RESTY_EVENTS=2dcd1d7a256c53103c0fdbe804f419174e0ea8ba # 0.3.0
 LUA_RESTY_SIMDJSON=7e6466ce91b2bc763b45701a4f055e94b1e8143b # 1.1.0
 LUA_RESTY_WEBSOCKET=966c69c39f03029b9b42ec0f8e55aaed7d6eebc0 # 0.4.0.1