derp

Author: aus

client/client.go

@@ -15,10 +15,6 @@ import (
 	chshare "github.com/aus/chisel/share"
 	"github.com/gorilla/websocket"
 	"github.com/jpillora/backoff"
-<<<<<<< HEAD
-=======
-	chshare "github.com/jpillora/chisel/share"
->>>>>>> butterflyfx/custom-headers
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/proxy"
 )

main.go

@@ -10,15 +10,9 @@ import (
 	"strconv"
 	"strings"
 
-<<<<<<< HEAD
-	"github.com/aus/chisel/client"
-	"github.com/aus/chisel/server"
+	chclient "github.com/aus/chisel/client"
+	chserver "github.com/aus/chisel/server"
 	chshare "github.com/aus/chisel/share"
-=======
-	chclient "github.com/jpillora/chisel/client"
-	chserver "github.com/jpillora/chisel/server"
-	chshare "github.com/jpillora/chisel/share"
->>>>>>> butterflyfx/custom-headers
 )
 
 var help = `