fix merge bug
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user