rebase to upstream

graial · graial · commit 412e8b494dbc · 2025-01-22T20:19:15.000+08:00
diff --git a/_data/meetups.yml b/_data/meetups.yml
@@ -3872,6 +3872,7 @@
   date: 2025-01-14
   start_time: 20:30:00 EST
   end_time: 22:00:00 EST
+<<<<<<< HEAD
   url: https://www.meetup.com/phillyrb/events/304568429
 
 - name: RubyJax - Open Hax January 2025
