Merge in order to be able to push.

Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/customer_szeged_281
test
2022-06-06 18:01:43 +02:00 · 2022-06-06 18:01:09 +02:00 · 2022-06-06 17:12:14 +02:00 · 2022-06-06 16:50:30 +02:00
5 changed files with 5 additions and 5 deletions
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -1,5 +1,5 @@
 {
 "title":"DC2C_pri31",
 "version":"27.02.2023 12:20 00001",
-"":""
-}
+"":"xxxx"
+}
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -1,5 +1,6 @@
 {
 "title":"DC2C_pri32",
 "version":"27.02.2023 12:20 00001",
-"":"zone2"
+"":"",
+"":""
 }
--- a/etc/psa_tariff/summer_tariff.json
+++ b/etc/psa_tariff/summer_tariff.json
--- a/etc/psa_tariff/winter_tariff.json
+++ b/etc/psa_tariff/winter_tariff.json
--- a/opt/app/ATBAPP/tariff.current
+++ b/opt/app/ATBAPP/tariff.current
@@ -0,0 +1 @@
+"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"
Author	SHA1	Message	Date
Gerhard Hoffmann	43e4d632db	Merge in order to be able to push. Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/customer_szeged_281	2022-06-06 18:01:43 +02:00
Gerhard Hoffmann	5aa772395f	test	2022-06-06 18:01:09 +02:00
Gerhard Hoffmann	2b8d50882a	add tariff-current	2022-06-06 17:12:14 +02:00
Gerhard Hoffmann	9ebd22c828	ignore everything in the first place	2022-06-06 16:50:30 +02:00
				`@@ -0,0 +1 @@`
				`"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"`