resolve conflict

cmd/build.go

@@ -5,7 +5,7 @@ import (
 	"log"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
 )
 
 // buildCmd represents the build command

cmd/conf.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 // confCmd represents the conf command

cmd/down.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 // downCmd represents the down command

cmd/exec.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 // execCmd represents the exec command

cmd/init.go

@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
 )
 
 // initCmd represents the init command

cmd/ps.go

@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
 )
 
 // psCmd represents the ps command

cmd/pull.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
 )
 
 // pullCmd represents the pull command

cmd/reconf.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 // reconfCmd represents the reconf command

cmd/reup.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 // reupCmd represents the reup command

cmd/root.go

@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 
 	"github.com/spf13/viper"
 )

cmd/test.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 // testCmd represents the test command

cmd/up.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 // upCmd represents the up command

cmd/upconf.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/tinynetwork/tn/internal/pkg/shell"
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/shell"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 // upconfCmd represents the upconf command

internal/pkg/shell/shell.go

@@ -8,7 +8,7 @@ import (
 	l "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 
-	"github.com/tinynetwork/tn/internal/pkg/utils"
+	"github.com/tinynetwork/tinet/internal/pkg/utils"
 )
 
 var log = l.New()

main.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package main
 
-import "github.com/tinynetwork/tn/cmd"
+import "github.com/tinynetwork/tinet/cmd"
 
 func main() {
 	cmd.Execute()