Changeset 3b6002d in libros for maquetacion/compilacion.toc

Timestamp:

Apr 7, 2014, 1:15:42 PM (10 years ago)

Author:

Antonio Araujo Brett <aaraujo@…>

Branches:

master, revisionfinal

Children:

43b582e

Parents:

50e5365 (diff), 82864d5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Cambios en .gitignore para no guardar en el control de versiones los archivos .lof .lot .toc .idx

File:

• maquetacion/compilacion.toc (modified) (1 diff)

maquetacion/compilacion.toc

@@ -18 +18 @@
 \contentsline {subsection}{\numberline {1.3.1}T\IeC {\'e}cnicas de identificaci\IeC {\'o}n y autenticaci\IeC {\'o}n}{4}
 \contentsline {subsubsection}{\numberline {1.3.1.1}Contrase\IeC {\~n}as}{4}
+<<<<<<< HEAD
 \contentsline {subsubsection}{\numberline {1.3.1.2}Certificados electr\IeC {\'o}nicos}{4}
 \contentsline {subsubsection}{\numberline {1.3.1.3}Firmas electr\IeC {\'o}nicas}{4}
 \contentsline {subsubsection}{\numberline {1.3.1.4}Dispositivos de usuario}{4}
+=======
+\contentsline {subsubsection}{\numberline {1.3.1.2}Certificados electr\IeC {\'o}nicos}{5}
+\contentsline {subsubsection}{\numberline {1.3.1.3}Firmas electr\IeC {\'o}nicas}{5}
+\contentsline {subsubsection}{\numberline {1.3.1.4}Dispositivos de usuario}{6}
+>>>>>>> 82864d55d449a197893fe70ca3d806071f663995
 \contentsline {chapter}{\numberline {2}Pol\'iticas de Seguridad}{21}
 \nobreak \vskip \authorskip \noindent \vrule height 9pt width0pt\hskip \chapskip A. Araujo y V. Bravo \hfill \vskip \chapheight