From 21f1d3283b03e7683b16922e4fd4d1baa2324b4d Mon Sep 17 00:00:00 2001 From: Expo on server Date: Fri, 4 Aug 2023 08:29:48 +0100 Subject: [PATCH] Online edit of entrance 1623-2023-ASH-05a --- cave_data/1623-2023-ASH-05.html | 16 ++++------------ entrance_data/1623-2023-ASH-05a.html | 12 ++---------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/cave_data/1623-2023-ASH-05.html b/cave_data/1623-2023-ASH-05.html index 8b8613be3..fbdf5ded9 100644 --- a/cave_data/1623-2023-ASH-05.html +++ b/cave_data/1623-2023-ASH-05.html @@ -1,9 +1,5 @@ -<<<<<<< HEAD - -======= - ->>>>>>> 2b1ab547 (Online edit of entrance 1623-2023-ASH-05a) + -<<<<<<< HEAD -This file is generated by troggle on Aug. 4, 2023, 7:30 a.m. UTC using the form documented at -======= -This file is generated by troggle on Aug. 4, 2023, 7:28 a.m. UTC using the form documented at ->>>>>>> 2b1ab547 (Online edit of entrance 1623-2023-ASH-05a) +This file is generated by troggle on Aug. 4, 2023, 8:29 a.m. UTC using the form documented at the form documented at handbook/survey/caveentry.html
@@ -48,8 +40,8 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast 1623-2023-ASH-05a - - a + + diff --git a/entrance_data/1623-2023-ASH-05a.html b/entrance_data/1623-2023-ASH-05a.html index ed2b6307f..458425b21 100644 --- a/entrance_data/1623-2023-ASH-05a.html +++ b/entrance_data/1623-2023-ASH-05a.html @@ -1,10 +1,6 @@ -<<<<<<< HEAD - -======= - ->>>>>>> 2b1ab547 (Online edit of entrance 1623-2023-ASH-05a) + @@ -18,11 +14,7 @@ though, you do not need to do a data import as it happens automatically --> -<<<<<<< HEAD -This file is generated by troggle on Aug. 4, 2023, 7:30 a.m. UTC using the form documented at -======= -This file is generated by troggle on Aug. 4, 2023, 7:28 a.m. UTC using the form documented at ->>>>>>> 2b1ab547 (Online edit of entrance 1623-2023-ASH-05a) +This file is generated by troggle on Aug. 4, 2023, 8:29 a.m. UTC using the form documented at handbook/survey/ententry.html