1 files changed, 3 insertions, 0 deletions

diff --git a/aoc/n.lyx b/aoc/n.lyx
index 87cd742..0a9a512 100644
--- a/aoc/n.lyx
+++ b/aoc/n.lyx
@@ -183,6 +183,8 @@ filename "n1.lyx"
 
 \end_layout
 
+<<<<<<< HEAD
+=======
 \begin_layout Chapter
 Arquitecturas superescalares
 \end_layout
@@ -197,5 +199,6 @@ filename "n2.lyx"
 
 \end_layout
 
+>>>>>>> aoc
 \end_body
 \end_document