From bbc424cff6f350e73be868c96a9f017a57161763 Mon Sep 17 00:00:00 2001 From: Krad Date: Fri, 10 Dec 2021 10:25:02 +0800 Subject: [PATCH] fix merge bug --- src/json/jsonobject.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/json/jsonobject.h b/src/json/jsonobject.h index 44385a8..2194258 100644 --- a/src/json/jsonobject.h +++ b/src/json/jsonobject.h @@ -2,11 +2,11 @@ #define JSONOBJECT_H //#include -class QString; + class QStringList; class QTranslator; - +#include struct host { QString name; QString ae;