fga-eps-mds/2021.1-Oraculo#88 solving conflicts

Co-authored-by: Lucas Vieira de Jesus <lucas.engen.cc@gmail.com> Co-authored-by: Antonio Igor Carvalho <antonioigorcarvalho@gmail.com>
fga-eps-mds · Nov 6, 2021 · 30352e7 · 30352e7
1 parent 81fb2bd
commit 30352e7
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/Components/SectionMovBlock/index.js b/src/Components/SectionMovBlock/index.js
@@ -29,15 +29,8 @@ const SectionMovBlock = ({ forwardSector }) => {
           <p>{forwardSector.name}</p>
         </div>
         <div>
-<<<<<<< HEAD
-          <p>
-            {fowardSector.defaultText}: {fowardSector.setor}
-          </p>
-          <p>{fowardSector.date}</p>
-=======
           <p>Registro encaminhado para: {forwardSector.setor}</p>
           <p>{forwardSector.date}</p>
->>>>>>> 404118ac8fd55609e53f9f33795178a20e28790b
         </div>
       </DivMovBlock>
     </>