Skip to content

Commit b9af029

Browse files
committed
Merge branch 'feature/timed_execution' of github.com:chermehdi/go-egor into feature/timed_execution
2 parents 6ec7224 + 79615ff commit b9af029

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

commands/run.go

+3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ import (
44
"bytes"
55
"errors"
66
"fmt"
7+
<<<<<<< HEAD
78
"github.com/chermehdi/egor/config"
89
"github.com/chermehdi/skimo/skimo"
910
"github.com/fatih/color"
1011
"github.com/jedib0t/go-pretty/table"
12+
=======
13+
>>>>>>> 79615ff894b1bfca7f91ab4ff44e7b6c5f628e54
1114
"io/ioutil"
1215
"os"
1316
"os/exec"

0 commit comments

Comments
 (0)