From dfa2947b0675583a4d34e21bd7bdc4fc2c6cdd89 Mon Sep 17 00:00:00 2001 From: Expo laptop Crowley Date: Fri, 4 Aug 2023 22:47:12 +0200 Subject: [PATCH] merged --- handbook/garlictarp.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/handbook/garlictarp.html b/handbook/garlictarp.html index ea55dbfd9..cea9821ee 100644 --- a/handbook/garlictarp.html +++ b/handbook/garlictarp.html @@ -1,4 +1,7 @@ +<<<<<<< HEAD Gal; +======= +>>>>>>> 7a9b844f (added garlic camp rigging topo: garlictarp.html) @@ -12,7 +15,11 @@

New for 2023, Garlic Cave Camp is "practical" (Ben Chaddock, 2023).

+<<<<<<< HEAD

This guide was written by Joe Stell in 2023 (week 5) with much help from Jono Lester, and as Garlic Camp is still very much a work in progress, feel free to experiment with tarp setups and update this guide should you find an improvement - make sure to credit yourself!

+======= +

This guide was written by Joe Stell in 2023 (week 5) with help from Nadia Raeburn-Cherradi and Jono Lester - as Garlic Camp is still very much a work in progress, feel free to experiment with tarp setups and update this guide should you find an improvement - make sure to credit yourself!

+>>>>>>> 7a9b844f (added garlic camp rigging topo: garlictarp.html)

Directions, Terminology and Pre-amble

@@ -47,4 +54,8 @@

Tarp 2

+<<<<<<< HEAD +======= + +>>>>>>> 7a9b844f (added garlic camp rigging topo: garlictarp.html)