Ignore:
Timestamp:
May 1, 2023, 4:19:09 PM (3 years ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, master, stuck-waitfor-destruct
Children:
c083c3d
Parents:
a50fdfb (diff), 985b624 (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:

resolved merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/theses/colby_parsons_MMAth/.gitignore

    ra50fdfb r6e1e2d0  
    1 build/*.aux
    2 build/*.acn
    3 build/*.acr
    4 build/*.alg
    5 build/*.bbl
    6 build/*.blg
    7 build/*.brf
    8 build/*.dvi
    9 build/*.glg
    10 build/*.glo
    11 build/*.gls
    12 build/*.idx
    13 build/*.ind
    14 build/*.ist
    15 build/*.lof
    16 build/*.log
    17 build/*.lol
    18 build/*.lot
    19 build/*.out
    20 build/*.ps
    21 build/*.pstex
    22 build/*.pstex_t
    23 build/*.tex
    24 build/*.toc
     1# Intermediate Results:
     2build/
     3
     4# Final Files:
    255*.pdf
    26 *.png
    276*.ps
    28 figures/*.tex
    297
    30 examples
     8# The Makefile here is not generated.
     9!Makefile
Note: See TracChangeset for help on using the changeset viewer.