fix(core) rebase fix

Kong · Dec 13, 2022 · 7e06d95 · 7e06d95
1 parent be7ea58
commit 7e06d95
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/kong/runloop/handler.lua b/kong/runloop/handler.lua
@@ -10,12 +10,8 @@ local certificate  = require "kong.runloop.certificate"
 local concurrency  = require "kong.concurrency"
 local workspaces   = require "kong.workspaces"
 local lrucache     = require "resty.lrucache"
-<<<<<<< HEAD
 local marshall     = require "kong.cache.marshall"
-
-=======
 local ktls         = require("resty.kong.tls")
->>>>>>> aebd07c56 (feat(core) tls protocol upstream support upstream tls config)
 
 local PluginsIterator = require "kong.runloop.plugins_iterator"
 local instrumentation = require "kong.tracing.instrumentation"