Ignore:
Timestamp:
Sep 19, 2022, 8:11:02 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, ast-experimental, master, pthread-emulation
Children:
aa9f215
Parents:
ebf8ca5 (diff), ae1d151 (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/pl.bib

    rebf8ca5 r23a08aa0  
    37573757    series      = {Innovative Technology},
    37583758    year        = 1991,
     3759}
     3760
     3761@mastersthesis{Zulfiqar22,
     3762    keywords    = {Cforall, memory allocation, threading},
     3763    contributer = {pabuhr@plg},
     3764    author      = {Mubeen Zulfiqar},
     3765    title       = {High-Performance Concurrent Memory Allocation},
     3766    school      = {School of Computer Science, University of Waterloo},
     3767    year        = 2022,
     3768    address     = {Waterloo, Ontario, Canada, N2L 3G1},
     3769    note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/18329}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/18329}},
    37593770}
    37603771
Note: See TracChangeset for help on using the changeset viewer.