Skip to content

Commit 380d108

Browse files
author
EIKE SOEREN VOM BAUER
committed
removed unused import
1 parent 8701528 commit 380d108

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

main.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ import (
44
"awesome-ci/service"
55
"flag"
66
"fmt"
7-
<<<<<<< HEAD
8-
=======
9-
"io/ioutil"
10-
"log"
11-
>>>>>>> ec5109b3b8a4649530e5d2d430c0ee44624b9be8
127
"os"
138
)
149

@@ -38,11 +33,7 @@ type getBuildInfosSet struct {
3833
}
3934

4035
func init() {
41-
<<<<<<< HEAD
4236
flag.StringVar(&cienv, "cienv", "Github", "set your CI Environment for Special Featueres!\nAvalible: Jenkins, Github, Gitlab, Custom\nDefault: Github")
43-
=======
44-
cienv = flag.String("cienv", "Github", "set your CI Environment for Special Featueres!\nAvalible: Jenkins, Github, Gitlab, Custom\nDefault: Github")
45-
>>>>>>> ec5109b3b8a4649530e5d2d430c0ee44624b9be8
4637
flag.BoolVar(&versionFlag, "version", false, "print version by calling it")
4738
// flag.BoolVar(&debug, "debug", false, "enable debug level by calling it")
4839

0 commit comments

Comments
 (0)