Ignore:
Timestamp:
Feb 26, 2024, 3:53:42 AM (21 months ago)
Author:
JiadaL <j82liang@…>
Branches:
master
Children:
3f9a8d0
Parents:
0522ebe (diff), 022bce0 (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:

Resolve conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/bibliography/pl.bib

    r0522ebe ra4da45e  
    37423742    month       = jul, year = 1987,
    37433743    volume      = 4, number = 4, pages = {9-16}
     3744}
     3745
     3746@manual{FreePascal,
     3747    keywords    = {Pascal, object oriented},
     3748    contributer = {pabuhr@plg},
     3749    author      = {Micha\"{e}l Van Canneyt},
     3750    title       = {{F}ree {P}ascal Reference Guide, version 3.2.2},
     3751    month       = may,
     3752    year        = 2021,
     3753    note        = {\url{http://downloads.freepascal.org/fpc/docs-pdf/ref.pdf}},
    37443754}
    37453755
     
    82438253}
    82448254
     8255@manual{Swift,
     8256    keywords    = {Swift programming language},
     8257    contributer = {pabuhr@plg},
     8258    key         = {Swift},
     8259    author      = {Chris Lattner and Doug Gregor and John McCall and Ted Kremenek and Joe Groff and Apple Inc.},
     8260    title       = {The Swift Programming Language},
     8261    edition     = {5.9.2},
     8262    organization= {Apple Inc.},
     8263    address     = {Cupertino, CA, USA},
     8264    year        = 2024,
     8265    note        = {\url{https://docs.swift.org/swift-book/documentation/the-swift-programming-language}},
     8266}
     8267
    82458268@inproceedings{Burns81,
    82468269    keywords    = {N-thread software-solution mutual exclusion},
Note: See TracChangeset for help on using the changeset viewer.