Skip to content

Commit

Permalink
Merge branch 'master' into minimal
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Broer committed Oct 16, 2015
2 parents da57553 + 79677bf commit df6faaa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

// var Version string
const Version = "0.9.3"
const Version = "0.9.4"

var (
nameservers = []string{}
Expand Down Expand Up @@ -55,7 +55,7 @@ func main() {
},
cli.BoolFlag{
Name: "default-resolver, d",
Usage: "make go-dnsmasq the default name server (updates /etc/resolv.conf)",
Usage: "make go-dnsmasq the local primary nameserver (updates /etc/resolv.conf)",
EnvVar: "DNSMASQ_DEFAULT",
},
cli.StringFlag{
Expand Down

0 comments on commit df6faaa

Please sign in to comment.