#include "mainwindow.h" #include <<<<<<< HEAD <<<<<<< HEAD int main(int argc, char *argv[]) { ======= int main(int argc, char *argv[]) { >>>>>>> f886b4b (Initial commit) ======= int main(int argc, char *argv[]) { >>>>>>> f886b4b (Initial commit) QApplication a(argc, argv); MainWindow w; w.show(); return a.exec(); }