rebase to upstream

graial · graial · commit c2ab09222db3 · 2025-01-22T20:19:15.000+08:00
diff --git a/_data/meetups.yml b/_data/meetups.yml
@@ -4015,6 +4015,7 @@
   date: 2025-01-22
   start_time: 19:00:00 CST
   end_time: 19:00:00 CST
+<<<<<<< HEAD
   url: https://www.meetup.com/rails-taiwan/events/305645957
 
 - name: Ruby Türkiye - Virtual Meetup January 2025
