From cba8cbd13c0cbf5747d23d0c20134b073fa9cb89 Mon Sep 17 00:00:00 2001
From: Evgeniy Kulikov <kim@nspcc.ru>
Date: Tue, 7 Jul 2020 14:28:49 +0300
Subject: [PATCH] Fix merge conflicts

---
 app-settings.go | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app-settings.go b/app-settings.go
index c882b94c..81a3c945 100644
--- a/app-settings.go
+++ b/app-settings.go
@@ -158,15 +158,9 @@ func newSettings() *viper.Viper {
 	peers := flags.StringArrayP("peers", "p", nil, "NeoFS nodes")
 
 	// set prefers:
-<<<<<<< Updated upstream
-	v.Set("app.name", misc.ApplicationName)
-	v.Set("app.version", misc.Version)
-	v.Set("app.build_time", misc.Build)
-=======
-	v.Set(cfgApplicationName, "neofs-gw")
+	v.Set(cfgApplicationName, misc.ApplicationName)
 	v.Set(cfgApplicationVersion, misc.Version)
 	v.Set(cfgApplicationBuildTime, misc.Build)
->>>>>>> Stashed changes
 
 	// set defaults: