Skip to content

Commit 7467cb8

Browse files
author
graial
committed
rebase to upstream
1 parent b04011c commit 7467cb8

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

_data/meetups.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,7 +2873,6 @@
28732873
date: 2024-11-19
28742874
start_time: 17:00:00 PST
28752875
end_time: 21:00:00 PST
2876-
<<<<<<< HEAD
28772876
url: https://lu.ma/f4pfsigc
28782877

28792878
- name: South West Ruby - informal meetup
@@ -2895,8 +2894,6 @@
28952894
date: 2024-11-19
28962895
start_time: 17:00:00 PDT
28972896
end_time: 21:00:00 PDT
2898-
=======
2899-
>>>>>>> 15d725e (Meetup Updates from African Ruby, Atlanta Ruby, Austin.rb, B'more on Rails, and more (#837))
29002897
url: https://lu.ma/f4pfsigc
29012898

29022899
- name: South West Ruby - informal meetup
@@ -3315,6 +3312,13 @@
33153312
end_time: 20:00:00 CET
33163313
url: https://www.meetup.com/copenhagen-ruby-brigade/events/304755489
33173314

3315+
- name: Boulder Ruby - December 2024 Presentation Night
3316+
location: Boulder, CO
3317+
date: 2024-12-11
3318+
start_time: 18:00:00 MST
3319+
end_time: 20:30:00 MST
3320+
url: https://lu.ma/y1c2jita
3321+
33183322
- name: Brighton Ruby Group - Silicon Brighton Big Festive Meetup
33193323
location: Hove, UK
33203324
date: 2024-12-11

0 commit comments

Comments
 (0)