From b6290b94cac76a5634cd90b495b65d91ee92d85e Mon Sep 17 00:00:00 2001 From: QuakeGod <QuakeGod@sina.com> Date: 星期三, 22 二月 2023 08:57:38 +0800 Subject: [PATCH] fix conflict --- Inc/KMachine.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Inc/KMachine.h b/Inc/KMachine.h index 15e119e..93d5722 100644 --- a/Inc/KMachine.h +++ b/Inc/KMachine.h @@ -153,7 +153,7 @@ UCHAR CurStations; UCHAR Running; UCHAR Health; -}; +}stPortStatus,*pPortStatus; enum enPortType { -- Gitblit v1.9.1