From 4a587b306d3ac8a5758dc0099d01a82ba97fcd6d Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 12 Sep 2022 15:05:50 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/portrait/diff-filtered.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 12c5f4a9..d7c5f53e 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-09-11 11:23:07.017169844 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-09-12 15:05:43.754919601 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-31 18:53:56.794842960 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-31 18:53:57.290849828 +0000 +@@ -14,6 +14,6 @@