Merge Conflicts
This pull request has merge conflicts that must be resolved before merging.
git checkout master && git pull && git checkout add_calenadar && git merge master
app/controllers/google_calendar_controller.rb
app/jobs/sync_all_google_calendars_job.rb
app/jobs/sync_google_calendar_job.rb
app/models/calendar_event.rb
app/models/google_calendar_connection.rb
app/services/google_calendar/client.rb
app/services/google_calendar/sync.rb
config/application.rb
config/recurring.yml
config/routes.rb
db/migrate/20261002090000_create_calendar_events.rb
db/migrate/20261002100000_add_google_calendar.rb
db/schema.rb
react-native/App.jsx
Summary
State the change and its purpose.
Tests
PR Checks
Issue Alignment