clean up merge conflicts

TykTechnologies · Mar 24, 2021 · 8f46633 · 8f46633
1 parent ff2f037
commit 8f46633
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/apidef/api_definitions.go b/apidef/api_definitions.go
@@ -196,13 +196,6 @@ type VirtualMeta struct {
 	ProxyOnError         bool   `bson:"proxy_on_error" json:"proxy_on_error"`
 }
 
-type GoPluginMeta struct {
-	Path       string `bson:"path" json:"path"`
-	Method     string `bson:"method" json:"method"`
-	PluginPath string `bson:"plugin_path" json:"plugin_path"`
-	SymbolName string `bson:"func_name" json:"func_name"`
-}
-
 type MethodTransformMeta struct {
 	Path     string `bson:"path" json:"path"`
 	Method   string `bson:"method" json:"method"`

diff --git a/gateway/api_definition.go b/gateway/api_definition.go
@@ -140,6 +140,7 @@ type URLSpec struct {
 	ValidatePathMeta          apidef.ValidatePathMeta
 	Internal                  apidef.InternalMeta
 	GoPluginMeta              GoPluginMiddleware
+
 	IgnoreCase                bool
 }
 
@@ -1245,6 +1246,10 @@ func (a *APISpec) CheckSpecMatchesStatus(r *http.Request, rxPaths []URLSpec, mod
 		case GoPlugin:
 			if method == rxPaths[i].GoPluginMeta.Meta.Method {
 				return true, &rxPaths[i].GoPluginMeta
+<<<<<<< HEAD
+=======
+
+>>>>>>> 6359edc9... clean up merge conflicts
 			}
 		}
 	}