Changeset 3b6002d in libros for maquetacion/compilacion.lot


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • maquetacion/compilacion.lot

    r50e5365 r3b6002d  
     1<<<<<<< HEAD
    12\contentsline {table}{\numberline {1.1\relax }{\ignorespaces Indicadores del Servicio de Telefon\IeC {\'\i }a M\IeC {\'o}vil a nivel Nacional para el 2013.}}{14}
    23\contentsline {table}{\numberline {1.2\relax }{\ignorespaces Proporci\IeC {\'o}n de suscriptores por tipo de tecnolog\IeC {\'\i }a m\IeC {\'o}vil.}}{14}
     4=======
     5>>>>>>> 82864d55d449a197893fe70ca3d806071f663995
Note: See TracChangeset for help on using the changeset viewer.