update gitignore

.gitignore

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

CMakeLists.txt

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

main.cpp

@@ -2,11 +2,16 @@
 
 #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,6 +1,7 @@
 #include "mainwindow.h"
 #include "./ui_mainwindow.h"
 <<<<<<< HEAD
+<<<<<<< HEAD
 #include "goods/goods.h"
 #include "check/check.h"
 
@@ -37,6 +38,8 @@ 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)
@@ -48,5 +51,8 @@ MainWindow::MainWindow(QWidget *parent)
 MainWindow::~MainWindow()
 {
     delete ui;
+<<<<<<< HEAD
+>>>>>>> f886b4b (Initial commit)
+=======
 >>>>>>> f886b4b (Initial commit)
 }

mainwindow.h

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

mainwindow.ui

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