Fix merge conflicts

kondukto-io · Feb 10, 2020 · dadb51a · dadb51a
2 parents f8d6353 + 0db8543
commit dadb51a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmd/scan.go b/cmd/scan.go
@@ -40,6 +40,7 @@ const (
 	toolFortify         = "fortify"
 	toolGosec           = "gosec"
 	toolDependencyCheck = "dependencycheck"
+	toolBrakeman        = "brakeman"
 )
 
 // scanCmd represents the scan command
@@ -222,7 +223,7 @@ func init() {
 
 func validTool(tool string) bool {
 	switch tool {
-	case toolAppSpider, toolBandit, toolCheckmarx, toolFindSecBugs, toolNetsparker, toolZap, toolFortify, toolGosec, toolDependencyCheck:
+	case toolAppSpider, toolBandit, toolCheckmarx, toolFindSecBugs, toolNetsparker, toolZap, toolFortify, toolGosec, toolDependencyCheck, toolBrakeman:
 		return true
 	default:
 		return false

diff --git a/cmd/version.go b/cmd/version.go
@@ -15,7 +15,7 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "prints version number of KDT",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("KDT Kondukto Client v1.0.6")
+		fmt.Println("KDT Kondukto Client v1.0.7")
 	},
 }