Changeset 80cdb2f for doc/bibliography


Ignore:
Timestamp:
Apr 5, 2017, 9:05:36 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
2264c11
Parents:
2f0a3599 (diff), 5671b8d (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:

fix merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/bibliography/cfa.bib

    r2f0a3599 r80cdb2f  
    45634563}
    45644564
    4565 @book{obj-c-book,
    4566     keywords    = {objective-c},
    4567     contributor = {a3moss@uwaterloo.ca},
    4568     author      = {{Apple Computer Inc.}},
    4569     title       = {The {Objective-C} Programming Language},
    4570     year        = 2002
     4565@manual{obj-c-book,
     4566    keywords = {objective-c},
     4567    contributor = {a3moss@uwaterloo.ca},
     4568    author = {{Apple Computer Inc.}},
     4569    title = {The {Objective-C} Programming Language},
     4570    publisher = {Apple Computer Inc.},
     4571    address = {Cupertino, CA},
     4572    year = 2003
    45714573}
    45724574
Note: See TracChangeset for help on using the changeset viewer.