26 lines
414 B
C++
26 lines
414 B
C++
<<<<<<< HEAD
|
|
#include "mainwindow.h"
|
|
|
|
#include <QApplication>
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
QApplication a(argc, argv);
|
|
MainWindow w;
|
|
w.show();
|
|
return a.exec();
|
|
}
|
|
=======
|
|
#include "mainwindow.h"
|
|
|
|
#include <QApplication>
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
QApplication a(argc, argv);
|
|
MainWindow w;
|
|
w.show();
|
|
return a.exec();
|
|
}
|
|
>>>>>>> 799590bc1dd9b9faee90d554f54d6ad46e8b8ddd
|