Skip to content

Commit

Permalink
Manual merge
Browse files Browse the repository at this point in the history
  • Loading branch information
JimOfLeisure committed Apr 10, 2020
2 parents 0c4f1c9 + a7bc6e5 commit de0f80f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 83 deletions.
3 changes: 1 addition & 2 deletions cmd/civ3sat/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var pathFlag = cli.StringFlag{
func main() {
app := cli.NewApp()
app.Name = "Civ3 Show-And-Tell"
app.Version = "0.4.1"
app.Version = "0.4.0"
app.Usage = "A utility to extract data from Civ3 SAV and BIQ files. Provide a file name of a SAV or BIQ file after the command."

app.Commands = []cli.Command{
Expand Down Expand Up @@ -144,6 +144,5 @@ func main() {
},
},
}

app.Run(os.Args)
}
81 changes: 0 additions & 81 deletions parseciv3/develop.go

This file was deleted.

0 comments on commit de0f80f

Please sign in to comment.