rebase to upstream

graial · graial · commit e297f82b2945 · 2025-01-22T20:19:15.000+08:00
diff --git a/_data/meetups.yml b/_data/meetups.yml
@@ -4058,6 +4058,7 @@
   date: 2025-01-25
   start_time: 11:00:00 EAT
   end_time: 13:00:00 EAT
+<<<<<<< HEAD
   url: https://www.meetup.com/african_ruby_community/events/304339817
 
 - name: Pune Ruby Meetup - January Meetup
