Changes in / [27e02ff:05524e5] in libros

Location:

maquetacion

Files:

• compilacion.pdf (added)
• compilacion.synctex.gz (modified) (previous)
• compilacion.tex (modified) (4 diffs)
• introduccion/introduccion.tex (added)

maquetacion/compilacion.tex

@@ -76 +76 @@
 
 
-
 \dedication{A la creatividad}
 
@@ -112 +111 @@
 
 \begin{acronyms}
-%\acro{ISO}{International Standard Office}
 \import{./}{acronimosaaraujo}
 \import{./}{acronimosvbravo}
@@ -145 +143 @@
 \begin{introduction}
 
+<<<<<<< HEAD
+\import{introduccion/}{introduccion}
+=======
 \introauthor{Linus Torvalds, Ing.}
 {Universidad de Helsinki \\
@@ -157 +158 @@
 
 
+>>>>>>> 27e02ff13c3376c03317150fc5461fdbacfa5483
 
 \end{introduction}