fix merge bug

This commit is contained in:
Krad
2021-12-10 10:25:02 +08:00
parent dce0ad563c
commit bbc424cff6

View File

@@ -2,11 +2,11 @@
#define JSONOBJECT_H #define JSONOBJECT_H
//#include <QObject> //#include <QObject>
class QString;
class QStringList; class QStringList;
class QTranslator; class QTranslator;
#include <QString>
struct host { struct host {
QString name; QString name;
QString ae; QString ae;