Online edit of entrance 1623-2023-ASH-05a

This commit is contained in:
Philip Sargent 2023-08-04 07:28:05 +01:00
parent 668dc40420
commit bf198fd181
2 changed files with 16 additions and 0 deletions

View File

@ -1,5 +1,9 @@
<!DOCTYPE html>
<<<<<<< HEAD
<!-- This file is generated by troggle on Aug. 4, 2023, 7:30 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
=======
<!-- This file is generated by troggle on Aug. 4, 2023, 7:28 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
>>>>>>> 2b1ab547 (Online edit of entrance 1623-2023-ASH-05a)
<!-- Only put one cave in this file -->
<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
@ -10,7 +14,11 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<<<<<<< HEAD
<b>This file is generated by troggle</b> on Aug. 4, 2023, 7:30 a.m. UTC using the form documented at
=======
<b>This file is generated by troggle</b> on Aug. 4, 2023, 7:28 a.m. UTC using the form documented at
>>>>>>> 2b1ab547 (Online edit of entrance 1623-2023-ASH-05a)
the form documented at
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
<br>

View File

@ -1,6 +1,10 @@
<!DOCTYPE html>
<!-- Only put one entrance in this file -->
<<<<<<< HEAD
<!-- This file is generated by troggle on Aug. 4, 2023, 7:30 a.m. UTC using the form documented at handbook/survey/ententry.html -->
=======
<!-- This file is generated by troggle on Aug. 4, 2023, 7:28 a.m. UTC using the form documented at handbook/survey/ententry.html -->
>>>>>>> 2b1ab547 (Online edit of entrance 1623-2023-ASH-05a)
<!-- If you edit this file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
@ -14,7 +18,11 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<<<<<<< HEAD
<b>This file is generated by troggle</b> on Aug. 4, 2023, 7:30 a.m. UTC using the form documented at
=======
<b>This file is generated by troggle</b> on Aug. 4, 2023, 7:28 a.m. UTC using the form documented at
>>>>>>> 2b1ab547 (Online edit of entrance 1623-2023-ASH-05a)
<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
<br>
<entrance>