.gitignore

@@ -72,5 +72,3 @@ CMakeLists.txt.user*
 *.dll
 *.exe
 
-#Build
-build

CMakeLists.txt

@@ -38,7 +38,6 @@ else()
     else()
         add_executable(checks-parser
             ${PROJECT_SOURCES}
-<<<<<<< HEAD
 <<<<<<< HEAD
             goods/goods.h goods/goods.cpp
             check/check.h check/check.cpp
@@ -46,8 +45,6 @@ else()
             parser/module.h parser/module.cpp
             settings.h
 =======
->>>>>>> f886b4b (Initial commit)
-=======
 >>>>>>> f886b4b (Initial commit)
         )
     endif()

main.cpp

@@ -2,16 +2,11 @@
 
 #include <QApplication>
 
-<<<<<<< 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;

mainwindow.cpp

@@ -1,7 +1,6 @@
 #include "mainwindow.h"
 #include "./ui_mainwindow.h"
 <<<<<<< HEAD
-<<<<<<< HEAD
 #include "goods/goods.h"
 #include "check/check.h"
 
@@ -38,8 +37,6 @@ void MainWindow::on_checkType_currentIndexChanged(int index) {
 void MainWindow::on_parseButton_clicked() {
     std::cout << ui->checkContent->toPlainText().toStdString() << std::endl;
 =======
-=======
->>>>>>> f886b4b (Initial commit)
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -51,8 +48,5 @@ MainWindow::MainWindow(QWidget *parent)
 MainWindow::~MainWindow()
 {
     delete ui;
-<<<<<<< HEAD
->>>>>>> f886b4b (Initial commit)
-=======
 >>>>>>> f886b4b (Initial commit)
 }

mainwindow.h

@@ -3,13 +3,10 @@
 
 #include <QMainWindow>
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 #include "check/check.h"
 #include "parser/parser.h"
 
-=======
->>>>>>> f886b4b (Initial commit)
 =======
 >>>>>>> f886b4b (Initial commit)
 QT_BEGIN_NAMESPACE
@@ -18,7 +15,6 @@ class MainWindow;
 }
 QT_END_NAMESPACE
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 class MainWindow : public QMainWindow {
     Q_OBJECT
@@ -37,8 +33,6 @@ private slots:
 
     void on_parseButton_clicked();
 =======
-=======
->>>>>>> f886b4b (Initial commit)
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
@@ -46,9 +40,6 @@ class MainWindow : public QMainWindow
 public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
-<<<<<<< HEAD
->>>>>>> f886b4b (Initial commit)
-=======
 >>>>>>> f886b4b (Initial commit)
 
 private:

mainwindow.ui

@@ -6,14 +6,9 @@
    <rect>
     <x>0</x>
     <y>0</y>
-<<<<<<< HEAD
 <<<<<<< HEAD
     <width>827</width>
     <height>680</height>
-=======
-    <width>800</width>
-    <height>600</height>
->>>>>>> f886b4b (Initial commit)
 =======
     <width>800</width>
     <height>600</height>
@@ -23,7 +18,6 @@
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
-<<<<<<< HEAD
 <<<<<<< HEAD
   <widget class="QWidget" name="centralwidget">
    <widget class="QComboBox" name="storeType">
@@ -147,9 +141,6 @@
     </item>
    </widget>
   </widget>
-=======
-  <widget class="QWidget" name="centralwidget"/>
->>>>>>> f886b4b (Initial commit)
 =======
   <widget class="QWidget" name="centralwidget"/>
 >>>>>>> f886b4b (Initial commit)
@@ -158,7 +149,6 @@
     <rect>
      <x>0</x>
      <y>0</y>
-<<<<<<< HEAD
 <<<<<<< HEAD
      <width>827</width>
      <height>23</height>
@@ -171,15 +161,10 @@
    </widget>
    <addaction name="menuchecks_parser"/>
 =======
-=======
->>>>>>> f886b4b (Initial commit)
      <width>800</width>
      <height>23</height>
     </rect>
    </property>
-<<<<<<< HEAD
->>>>>>> f886b4b (Initial commit)
-=======
 >>>>>>> f886b4b (Initial commit)
   </widget>
   <widget class="QStatusBar" name="statusbar"/>