pull upstream

graial · graial · commit a2d92597bac0 · 2025-01-22T20:10:01.000+08:00
diff --git a/_data/meetups.yml b/_data/meetups.yml
@@ -4213,6 +4213,7 @@
   end_time: 21:30:00 EST
   url: https://www.meetup.com/charlotte-rb/events/305557477
 
+<<<<<<< HEAD
 - name: RubyJax - Open Hax February 2025
   location: Jacksonville, FL
   date: 2025-02-04
