Skip to content

G
gost
Commit 1d406e73 authored by nanahira's avatar nanahira
Browse files
Options

merge

parent a9c28789
Pipeline #13060 passed with stages
        in 2 minutes and 24 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 0 additions and 8 deletions
        chain.go
        View file @ 1d406e73
        ...@@ -39,13 +39,6 @@ func NewChain(nodes ...Node) *Chain { ...@@ -39,13 +39,6 @@ func NewChain(nodes ...Node) *Chain {
        // newRoute creates a chain route. // newRoute creates a chain route.
        // a chain route is the final route after node selection. // a chain route is the final route after node selection.
        func (c *Chain) newRoute(nodes ...Node) *Chain { func (c *Chain) newRoute(nodes ...Node) *Chain {
        <<<<<<< HEAD
        chain := NewChain(nodes...)
        chain.isRoute = true
        chain.Interface = c.Interface
        chain.Mark = c.Mark
        return chain
        =======
        route := NewChain(nodes...) route := NewChain(nodes...)
        route.isRoute = true route.isRoute = true
        if !c.IsEmpty() { if !c.IsEmpty() {
        ...@@ -53,7 +46,6 @@ func (c *Chain) newRoute(nodes ...Node) *Chain { ...@@ -53,7 +46,6 @@ func (c *Chain) newRoute(nodes ...Node) *Chain {
        route.Mark = c.Mark route.Mark = c.Mark
        } }
        return route return route
        >>>>>>> 0247b941ac31344f0d7b3c547941a051188ba202
        } }
        // Nodes returns the proxy nodes that the chain holds. // Nodes returns the proxy nodes that the chain holds.
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment