rebase to upstream

graial · graial · commit 5993c5f1c27e · 2025-01-22T20:18:19.000+08:00
diff --git a/_data/meetups.yml b/_data/meetups.yml
@@ -4213,7 +4213,6 @@
   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
