Fix merge.
This commit is contained in:
parent
1b2c03d048
commit
21d67e9dd7
|
@ -1102,7 +1102,22 @@ inproceedings{HHRRW14,
|
|||
}
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% TALKS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
<<<<<<< HEAD
|
||||
@talk{cornell20-talk,
|
||||
title = {Formally Verifying Randomized Algorithms},
|
||||
organization = {Fall 2020 CS Colloquium, Cornell University},
|
||||
year = 2020,
|
||||
month = nov,
|
||||
jh = yes,
|
||||
}
|
||||
|
||||
@talk{popv20-talk,
|
||||
title = {A Probabilistic Separation Logic},
|
||||
organization = {Principles of Programming and Verification Seminar, Boston University},
|
||||
year = 2020,
|
||||
month = nov,
|
||||
jh = yes,
|
||||
}
|
||||
|
||||
@talk{cmcs-talk,
|
||||
title = {Tutorial on Probabilistic Couplings},
|
||||
organization = {Coalgebraic Methods in Computer Science (CMCS), co-located
|
||||
|
@ -1124,44 +1139,6 @@ inproceedings{HHRRW14,
|
|||
title = {A Probabilistic Separation Logic},
|
||||
organization = {PL Club, University of Pennsylvania},
|
||||
year = 2020,
|
||||
=======
|
||||
@talk{cornell20-talk,
|
||||
title = {Formally Verifying Randomized Algorithms},
|
||||
organization = {Fall 2020 CS Colloquium, Cornell University},
|
||||
year = 2020,
|
||||
month = nov,
|
||||
jh = yes,
|
||||
}
|
||||
|
||||
@talk{popv20-talk,
|
||||
title = {A Probabilistic Separation Logic},
|
||||
organization = {Principles of Programming and Verification Seminar, Boston University},
|
||||
year = 2020,
|
||||
month = nov,
|
||||
jh = yes,
|
||||
}
|
||||
|
||||
@talk{cmcs-talk,
|
||||
title = {Tutorial on Probabilistic Couplings},
|
||||
organization = {Coalgebraic Methods in Computer Science (CMCS), co-located with ETAPS 2020},
|
||||
year = 2020,
|
||||
month = oct,
|
||||
jh = yes,
|
||||
}
|
||||
|
||||
@talk{cmu20-talk,
|
||||
title = {A Probabilistic Separation Logic},
|
||||
organization = {Principles of Programming Seminar, Carnegie Mellon University},
|
||||
year = 2020,
|
||||
month = sep,
|
||||
jh = yes,
|
||||
}
|
||||
|
||||
@talk{penn20-talk,
|
||||
title = {A Probabilistic Separation Logic},
|
||||
organization = {PL Club, University of Pennsylvania},
|
||||
year = 2020,
|
||||
>>>>>>> Update bibs.
|
||||
month = sep,
|
||||
jh = yes,
|
||||
}
|
||||
|
@ -8306,8 +8283,6 @@ note={Errata and Remarks maintained at:
|
|||
biburl = {https://dblp.org/rec/conf/popl/0001NMR16.bib},
|
||||
bibsource = {dblp computer science bibliography, https://dblp.org}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
@inproceedings{ding2018detecting,
|
||||
title={Detecting violations of differential privacy},
|
||||
|
@ -8316,4 +8291,3 @@ note={Errata and Remarks maintained at:
|
|||
pages={475--489},
|
||||
year={2018}
|
||||
}
|
||||
>>>>>>> Update bibs.
|
||||
|
|
Loading…
Reference in New Issue