===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.1162
retrieving revision 1.1163
diff -c -r1.1162 -r1.1163
*** www/events.html	2019/05/18 15:45:43	1.1162
--- www/events.html	2019/05/18 15:46:29	1.1163
***************
*** 52,61 ****
  <li>Bob Beck - 
  <a href="https://github.com/bob-beck/libtls/blob/master/TUTORIAL.md">libtls for beginners conference tutorial</a>
  <li>Theo Buehler - Design and verification of the TLSv1.3 handshake state machine in LibreSSL
- <<<<<<< events.html
- <li>Florian Obser - <a href="https://man.openbsd.org/unwind.8">unwind(8)</a> a privilege-separated, validating DNS recursive nameserver for every laptop
- <li>Stefan Sperling - Building an accessible OpenBSD laptop (Enabling secure and functional computing for a person with severe disabilities)
- =======
  <li>Florian Obser - <a href="https://man.openbsd.org/unwind.8">unwind(8)</a> a privilege-separated, validating DNS recursive nameserver for every laptop (<a href="papers/bsdcan2019_unwind.pdf">slides</a>)
  <li>Stefan Sperling - Building an accessible OpenBSD laptop (Enabling secure and functional computing for a person with severe disabilities) (<a href="papers/bsdcan2019-accessible-openbsd-laptop.pdf">slides</a>)
  <li>Antoine Jacoutot - <a href="https://man.openbsd.org/syspatch.8">syspatch(8)</a>, The Boring Healing Potion
--- 52,57 ----