fix merge conflict

2021-08-30 07:51:13 -07:00
parent fcf4d53d19 328913249f
commit 698ed48ff0
7 changed files with 64 additions and 31 deletions
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -2,11 +2,14 @@ package main

 import (
 //"fmt"
-//"github.com/BGrewell/go-conversions"
+   "github.com/BGrewell/go-conversions"
 //"github.com/BGrewell/go-iperf"
 //"time"
 	"fmt"
+<<<<<<< HEAD
 	"github.com/BGrewell/go-conversions"
+=======
+>>>>>>> 328913249f87399ed1ce133fec58df85a24aa9b0
 	"github.com/BGrewell/go-iperf"
 	"time"
 )