fix merge conflict

2021-08-30 07:54:59 -07:00
parent 698ed48ff0
commit 8e5fc7da0d
4 changed files with 10 additions and 19 deletions
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -6,10 +6,6 @@ import (
 //"github.com/BGrewell/go-iperf"
 //"time"
 	"fmt"
-<<<<<<< HEAD
-	"github.com/BGrewell/go-conversions"
-=======
->>>>>>> 328913249f87399ed1ce133fec58df85a24aa9b0
 	"github.com/BGrewell/go-iperf"
 	"time"
 )