Merge conflict resolution (late)

2016-06-27 00:02:10 -07:00 · 2016-06-27 00:02:10 -07:00 · 85ff9a797a
commit 85ff9a797a
parent 41ce2b511b
2 changed files with 5 additions and 10 deletions
--- a/templates_test/main_test/postgres_main.tpl
+++ b/templates_test/main_test/postgres_main.tpl
@ -10,12 +10,6 @@ type Config struct {
 	Postgres PostgresCfg `toml:"postgres"`
 }

-var (
-	cfg *Config
-	testCfg *Config
-	dbConn *sql.DB
-)
-
 func TestMain(m *testing.M) {
 	rand.Seed(time.Now().UnixNano())

--- a/templates_test/singleton/main_helper_funcs.tpl
+++ b/templates_test/singleton/main_helper_funcs.tpl
@ -1,6 +1,7 @@
-var testCfg *Config
-
-var dbConn *sql.DB
+var (
+  testCfg *Config
+  dbConn *sql.DB
+)

 func InitViper() error {
  var err error