Fix bad merge...

Author: pwilke

_data/conferences.yml

@@ -1825,13 +1825,8 @@
   year: 2024
   date: "Sep 9-14, 2024"
   link: https://itp-conference.github.io/
-<<<<<<< HEAD
   deadline: ["2024-03-18 23:59"]
   comment: Abstract registration Mar. 11th
-=======
-  deadline: ["2024-02-26 23:59"]
-  comment: Abstract registration Feb. 19
->>>>>>> 73e1b1c (fix ITP)
   timezone: Etc/GMT+12
   place: Tbilisi, Georgia
   tags: [FORMAL, CONF]