From 43dc9e008d2863ad995c7c3434eb973cfb2a1438 Mon Sep 17 00:00:00 2001
From: Softonik <softonik@ro.ru>
Date: Tue, 25 Jun 2024 22:24:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?=
 =?UTF-8?q?=D1=80=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=85=D0=BE=D0=B4=D1=8F=D1=89=D0=B8=D1=85=20=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=BC=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/input/conf/conf.go               | 8 +++++---
 pkg/input/{conf => config}/config.go | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename pkg/input/{conf => config}/config.go (93%)

diff --git a/pkg/input/conf/conf.go b/pkg/input/conf/conf.go
index b1f1e3e..fcf134b 100644
--- a/pkg/input/conf/conf.go
+++ b/pkg/input/conf/conf.go
@@ -2,21 +2,23 @@ package conf
 
 import (
 	"io"
-	"my/schet/pkg/schet"
 	"os"
 
+	"my/schet/pkg/input/config"
+	"my/schet/pkg/schet"
+
 	"github.com/yosuke-furukawa/json5/encoding/json5"
 )
 
 type Conf struct {
 	path   string
-	config *Config
+	config *config.Config
 	год    *schet.Год
 }
 
 func NewConf(path string) *Conf {
 	c := &Conf{
-		config: NewConfig(),
+		config: config.NewConfig(),
 		path:   path,
 	}
 	return c
diff --git a/pkg/input/conf/config.go b/pkg/input/config/config.go
similarity index 93%
rename from pkg/input/conf/config.go
rename to pkg/input/config/config.go
index f1553aa..9d4e453 100644
--- a/pkg/input/conf/config.go
+++ b/pkg/input/config/config.go
@@ -1,4 +1,4 @@
-package conf
+package config
 
 type Config struct {
 	Доходы []Доход `json:"Доходы"`