From 18e79265002d5be35cc0286742a98e929e94a6bb Mon Sep 17 00:00:00 2001
From: Mino1289 <kretzvictor@orange.fr>
Date: Fri, 22 Oct 2021 22:57:45 +0200
Subject: [PATCH] Finish merging (unsolved conflicts)

---
 apps/reader/tex_parser.cpp | 41 --------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/apps/reader/tex_parser.cpp b/apps/reader/tex_parser.cpp
index 93782eccc..5cd229ace 100644
--- a/apps/reader/tex_parser.cpp
+++ b/apps/reader/tex_parser.cpp
@@ -12,48 +12,7 @@ TexParser::TexParser(const char * text, const char * endOfText) :
 }
 
 Layout TexParser::getLayout() {
-<<<<<<< HEAD
-  HorizontalLayout layout = HorizontalLayout::Builder();
-  const char * start = m_text;
-  
-  while (m_text < m_endOfText) {
-    switch (*m_text)
-    {
-    case '\\':
-      if (start != m_text) {
-        layout.addOrMergeChildAtIndex(LayoutHelper::String(start, m_text - start), layout.numberOfChildren(), false);
-      }
-      m_text ++;
-      layout.addOrMergeChildAtIndex(popCommand(), layout.numberOfChildren(), false);
-      start = m_text;
-      break;
-    case ' ':
-      if (start != m_text) {
-        layout.addOrMergeChildAtIndex(LayoutHelper::String(start, m_text - start), layout.numberOfChildren(), false);
-      }
-      m_text++;
-      start = m_text;
-      break;
-    case '^':
-      if (start != m_text) {
-        layout.addOrMergeChildAtIndex(LayoutHelper::String(start, m_text - start), layout.numberOfChildren(), false);
-      }
-      m_text++;
-      layout.addOrMergeChildAtIndex(popCommand(), layout.numberOfChildren(),false);
-      start = m_text;
-      break;
-    default:
-      m_text++;
-      break;
-    }
-  }
-
-  if (start != m_text) {
-    layout.addOrMergeChildAtIndex(LayoutHelper::String(start, m_text - start), layout.numberOfChildren(), false);
-  }
-=======
   Layout layout = popText(0);
->>>>>>> 89c08acc7f59900fd12f2bdaacbae1827ccb73a1
 
   if (m_hasError) {
     return CodePointLayout::Builder(CodePoint(0xFFD));