UP-10 Resolved conflicts

extio1 · May 4, 2024 · 583e8ed · 583e8ed
1 parent 1d009b2
commit 583e8ed
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 91 deletions.
diff --git a/include/document.h b/include/document.h
@@ -13,12 +13,9 @@ class Document {
 public:
     explicit Document();
 
-<<<<<<< HEAD
     void Insert(Glyph::GlyphPtr glyph);
     void Remove(Glyph::GlyphPtr glyph);
 
-=======
->>>>>>> c0e893651f2a7b6a023ecf456ff92d9c884a02b3
     void SetCurrentPage(Page::PagePtr page);
     Page::PagePtr GetCurrentPage();
 

diff --git a/src/document.cpp b/src/document.cpp
@@ -11,7 +11,6 @@ Document::Document() {
     visiblePages.push_back(currentPage);
 }
 
-<<<<<<< HEAD
 void Document::Insert(Glyph::GlyphPtr glyph) {
     // currentPage.Insert(glyph);
     // TO DO
@@ -21,8 +20,6 @@ void Document::Remove(Glyph::GlyphPtr glyph) {
     // TO DO
 }
 
-=======
->>>>>>> c0e893651f2a7b6a023ecf456ff92d9c884a02b3
 void Document::SetCurrentPage(Page::PagePtr page) {
     currentPage = std::move(page);
 }

diff --git a/src/glyphs/composition.cpp b/src/glyphs/composition.cpp
diff --git a/src/glyphs/glyph.cpp b/src/glyphs/glyph.cpp
@@ -1,9 +1,5 @@
 #include "glyphs/utils/point.h"
 #include "glyphs/glyph.h"
-<<<<<<< HEAD
-=======
-#include "glyphs/glyph.h"
->>>>>>> c0e893651f2a7b6a023ecf456ff92d9c884a02b3
 
 Glyph::Glyph(const int _x, const int _y, const int _width, const int _height) : 
     x(_x), y(_y), width(_width), height(_height) {}

diff --git a/src/gui_signature.cpp b/src/gui_signature.cpp