Skip to content

Commit 8701528

Browse files
author
EIKE SOEREN VOM BAUER
committed
Merge branch 'feature/print-version' of github.com:eksrvb/awesome-ci into feature/print-version
2 parents 59ebadf + ec5109b commit 8701528

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

main.go

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

@@ -33,7 +38,11 @@ type getBuildInfosSet struct {
3338
}
3439

3540
func init() {
41+
<<<<<<< HEAD
3642
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
3746
flag.BoolVar(&versionFlag, "version", false, "print version by calling it")
3847
// flag.BoolVar(&debug, "debug", false, "enable debug level by calling it")
3948

0 commit comments

Comments
 (0)