From eb2e7dfff133c465c93e450ebc790695dadb9aeb Mon Sep 17 00:00:00 2001
From: Juan Marín Noguera <juan.marinn@um.es>
Date: Thu, 31 Dec 2020 17:36:12 +0100
Subject: Cachés
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aoc/n.lyx | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'aoc/n.lyx')

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
-- 
cgit v1.2.3