1 files changed, 15 insertions, 6 deletions
diff --git a/aoc/n.lyx b/aoc/n.lyx
index 0a9a512..789fe50 100644
--- a/aoc/n.lyx
+++ b/aoc/n.lyx
@@ -162,11 +162,9 @@ https://en.wikipedia.org/
  
 \emph on
 \lang english
-Dark Silicon
+Dark Silicon, SPMD
 \emph default
-\lang spanish
 .
- 
 \end_layout
 
 \begin_layout Chapter
@@ -183,8 +181,6 @@ filename "n1.lyx"
 
 \end_layout
 
-<<<<<<< HEAD
-=======
 \begin_layout Chapter
 Arquitecturas superescalares
 \end_layout
@@ -199,6 +195,19 @@ filename "n2.lyx"
 
 \end_layout
 
->>>>>>> aoc
+\begin_layout Chapter
+Sincronización entre núcleos
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset include
+LatexCommand input
+filename "n3.lyx"
+
+\end_inset
+
+
+\end_layout
+
 \end_body
 \end_document