rebase to upstream

Author: graial

_data/conferences.yml

@@ -2913,13 +2913,6 @@
   cfp_close_date: 2025-02-13
   cfp_link: https://docs.google.com/forms/d/e/1FAIpQLSdg-w3hF3V-Q7hNwXKzqEUv_y92oQaYWu4FSziFRhwEyMo3Hw/viewform
 
-- name: Sin City Ruby 2025
-  location: Las Vegas, NV
-  start_date: 2025-04-10
-  end_date: 2025-04-11
-  url: https://www.sincityruby.com
-  announced_on: 2024-11-14
-
 - name: RubyKaigi 2025
   location: Matsuyama, Ehime, Japan
   start_date: 2025-04-16
@@ -3003,14 +2996,6 @@
   twitter: railscamp_usa
   announced_on: 2024-12-02
 
-- name: Rails Camp West 2025
-  location: Kenai Lake, Alaska, USA
-  start_date: 2025-08-18
-  end_date: 2025-08-21
-  url: https://west.railscamp.us/2025
-  twitter: railscamp_usa
-  announced_on: 2024-12-02
-
 - name: Rails World 2025
   location: Amsterdam, Netherlands
   start_date: 2025-09-04

_data/meetup_groups.yml

@@ -47,14 +47,7 @@
   remove:
     - "[VIRTUAL] "
     - "[ATLRUG Virtual]"
-<<<<<<< HEAD
-<<<<<<< HEAD
     - "[ATLRUG]"
-=======
->>>>>>> a8d50df (Meetup Updates from African Ruby, Atlanta Ruby, DenHaag.rb, NYC.rb and more (#851))
-=======
-    - "[ATLRUG]"
->>>>>>> aa7543f (Meetup Updates from Atlanta Ruby, Charlotte Ruby, Columbus Ruby, Miami Ruby and more (#856))
     - "The Atlanta Ruby Meetup Group"
 
 - id: aucklandruby
@@ -528,15 +521,7 @@
 - id: punerubymeetup
   name: Pune Ruby Meetup
   service: luma
-<<<<<<< HEAD
-<<<<<<< HEAD
-  ical_url: https://api.lu.ma/ics/get?entity=calendar&id=cal-KTu2DlicAMuYZT1
-=======
-  ical_url: https://lu.ma/calendar/cal-KTu2DlicAMuYZT1
->>>>>>> e5015db (Add Pune Ruby Meetup Luma Calendar)
-=======
   ical_url: https://api.lu.ma/ics/get?entity=calendar&id=cal-KTu2DlicAMuYZT1
->>>>>>> ab80937 (Add 'Pune Ruby Meetup - January Meetup')
   timezone: Asia/Kolkata
 
 # - id: quillarb
@@ -993,12 +978,6 @@
   ical_url: https://api.lu.ma/ics/get?entity=calendar&id=cal-endgATTZCF1KdPk
   timezone: Europe/Stockholm
 
-- id: sthlmrb
-  name: Stockholm Ruby
-  service: luma
-  ical_url: https://api.lu.ma/ics/get?entity=calendar&id=cal-endgATTZCF1KdPk
-  timezone: Europe/Stockholm
-
 - id: stlruby
   name: STLRuby
   service: meetupdotcom