Merge conflicts

chermehdi · Apr 4, 2020 · 827b6e6 · 827b6e6
1 parent b9af029
commit 827b6e6
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/commands/run.go b/commands/run.go
@@ -4,13 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-<<<<<<< HEAD
-	"github.com/chermehdi/egor/config"
-	"github.com/chermehdi/skimo/skimo"
-	"github.com/fatih/color"
-	"github.com/jedib0t/go-pretty/table"
-=======
->>>>>>> 79615ff894b1bfca7f91ab4ff44e7b6c5f628e54
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -19,6 +12,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/chermehdi/egor/config"
+	"github.com/chermehdi/skimo/skimo"
+	"github.com/fatih/color"
+	"github.com/jedib0t/go-pretty/table"
+
 	"github.com/chermehdi/egor/config"
 	"github.com/fatih/color"
 	"github.com/jedib0t/go-pretty/table"