Merge branch 'aoc'

1 files changed, 17 insertions, 0 deletions

diff --git a/aoc/n.lyx b/aoc/n.lyx
index aafa697..0a9a512 100644
--- a/aoc/n.lyx
+++ b/aoc/n.lyx
@@ -183,5 +183,22 @@ filename "n1.lyx"
 
 \end_layout
 
+<<<<<<< HEAD
+=======
+\begin_layout Chapter
+Arquitecturas superescalares
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset include
+LatexCommand input
+filename "n2.lyx"
+
+\end_inset
+
+
+\end_layout
+
+>>>>>>> aoc
 \end_body
 \end_document