From 8ca806abdf5d63bb93c1cf9b3001d961b34f5a44 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Thu, 24 Apr 2025 10:01:50 +0800 Subject: [PATCH] FIX: unfinished merge conflict jira: [none] Change-Id: Id97c30a091957c7fe7c96f1818d1073f7993b581 --- resources/printers/version.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/printers/version.txt b/resources/printers/version.txt index 070b9064f..f86cbb485 100644 --- a/resources/printers/version.txt +++ b/resources/printers/version.txt @@ -1,5 +1 @@ -<<<<<<< HEAD (9f2e21 FIX: protect the EndModal functions while top dialog is not ) -02.00.00.14 -======= -02.00.00.17 ->>>>>>> CHANGE (04056a ENH: update temperature limit for all printer) +02.00.00.17 \ No newline at end of file