fix merge bug
This commit is contained in:
@@ -2,11 +2,11 @@
|
||||
#define JSONOBJECT_H
|
||||
|
||||
//#include <QObject>
|
||||
class QString;
|
||||
|
||||
class QStringList;
|
||||
class QTranslator;
|
||||
|
||||
|
||||
#include <QString>
|
||||
struct host {
|
||||
QString name;
|
||||
QString ae;
|
||||
|
||||
Reference in New Issue
Block a user