From 4950c6b0eb6ae112134316d55b5012da14785fef Mon Sep 17 00:00:00 2001
From: Birgit Brecknell
Date: Mon, 26 Aug 2024 08:15:12 +1000
Subject: [PATCH] fix errors
Signed-off-by: Birgit Brecknell
---
Foundation/Summit/2024/social-activities.html | 129 +-----------------
1 file changed, 2 insertions(+), 127 deletions(-)
diff --git a/Foundation/Summit/2024/social-activities.html b/Foundation/Summit/2024/social-activities.html
index 227311fe..1e0043a9 100644
--- a/Foundation/Summit/2024/social-activities.html
+++ b/Foundation/Summit/2024/social-activities.html
@@ -17,7 +17,6 @@
Social Activities
-<<<<<<< HEAD
A number of informal social activities are being organised by local Sydney-siders. Check out the list and contact the organiser to register your interest.
@@ -49,7 +48,7 @@- June will take a group on the iconic Bondi to Coogee walk, with optional dinner to follow at Coogee for who are people interested. + June will take a group on the iconic Bondi to Coogee walk, with optional dinner to follow at Coogee for people who are interested.
When: Monday 14 Oct 2024, starting at 3:30pm @@ -63,30 +62,10 @@
Bring:
-======= -A number of informal social activities are being organised by local Sydney-siders. Check out the list and contact the organiser to register your interest. - -- June will take a group on the iconic Bondi to Coogee walk, with dinner to follow at Coogee. -
-- When: Monday 14 Oct 2024, starting at 3:30pm -
-- Where: Bondi Beach -
-- Cost: Free, with the option of buying dinner at Coogee -
-- Bring: ->>>>>>> 87fe90f (rebase over master)
Contact: Peter Chubb.
- -======= -- Contact: June Andronick. -
- - - -- Gernot plans to take a group on a walk, most likely in the stunning Blue Mountains, which are about a 1.5 hours drive from Sydney. The details of this activity will be organised mid September 2024. Stay tuned! -
-- When: weekend of Oct 12 & 13, 2024 (TBC) -
-- Contact: Gernot Heiser -
- - -- Peter plans to take a group sailing in the Sydney Harbour on a replica of the 1600s ship, the Duyfken. -
-- Please note that this is a rare and special experience, so bookings will need to be made by 20 September 2024. Please contact Peter Chubb for further details, including how to make your booking. There may be a discount for a group booking of more than 16 people. Max 24 people. -
-- When: Date, Time -
-- Where: Australian National Maritime Museum -
-- Cost: $120 per person -
-- Bring: -
- Contact: Peter Chubb. -
- - - - -- Peter has offered to take a group on a tour of the Australian National Maritime Museum, including an onboard walkthrough of the major vessels: -
- When: Date, TimeThe full tour takes about five hours. -
-- Where: Australian National Maritime Museum -
-- Cost: $120 per person -
-- Contact: Peter Chubb. -
- - - - - -- Peter. -
-- When: Date, Time -
- -- Cost: -
-- Bring: -