fix some merge fails

This commit is contained in:
Jakob Schrettenbrunner
2017-10-09 21:01:24 +02:00
parent 659dbcb8c3
commit 72ac95267b
5 changed files with 28 additions and 31 deletions

View File

@@ -35,12 +35,12 @@ func Execute() {
}
func run(cmd *cobra.Command, args []string) {
tools.InitLogging()
utils.InitLogging()
log.Info("Loading configuration...")
if err := config.LoadConfiguration(configPath); err != nil {
log.WithError(err).Fatal("Failed to find configuration file")
}
tools.ConfigureLogging()
utils.ConfigureLogging()
log.Info(` ____`)
log.Info(`__ Pterodactyl _____/___/_______ _______ ______`)