Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_999 into zg1/zone1

29-04-2024T12:12:12 test message
Here a commit message: why the change ?
2024-04-29 12:45:27 +02:00 · 2024-04-29 12:45:13 +02:00 · 2024-04-25 08:29:07 +02:00
2 changed files with 2 additions and 1 deletions
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -14,5 +14,5 @@
 "Surcharge":0,	
 "Discount":0
 }
-#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
+#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500], 

--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -805,3 +805,4 @@

 }  

+
Author	SHA1	Message	Date
Gerhard Hoffmann	7f2469a5ec	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_999 into zg1/zone1	2024-04-29 12:45:27 +02:00
Gerhard Hoffmann	bb78e7c237	29-04-2024T12:12:12 test message	2024-04-29 12:45:13 +02:00
Hoffmann Gerhard	43005f7fdb	Here a commit message: why the change ?	2024-04-25 08:29:07 +02:00