rebase to upstream

Author: graial

_data/meetups.yml

@@ -2809,16 +2809,13 @@
   end_time: 13:00:00 EAT
   url: https://www.meetup.com/african_ruby_community/events/304228425
   status: cancelled
-<<<<<<< HEAD
 
 - name: Pune Ruby Users Group - November Ruby Meetup
   location: Pune, India
   date: 2024-11-16
   start_time: 11:00:00 IST
   end_time: 13:00:00 IST
   url: https://www.meetup.com/punerubymeetup/events/304252082
-=======
->>>>>>> e02ee27 (Add B'more on Rails, Philly.rb and RubyJax Meetups (#848))
 
 - name: Pune Ruby Users Group - November Ruby Meetup
   location: Pune, India