expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-09 15:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Expo on server
2023-08-04 08:29:48 +01:00
parent bf198fd181
commit 21f1d3283b
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cave_data/1623-2023-ASH-05.html
View File

@@ -1,9 +1,5 @@
<!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)
<!-- This file is generated by troggle on Aug. 4, 2023, 8:29 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- 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
@@ -14,11 +10,7 @@ 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)
<b>This file is generated by troggle</b> on Aug. 4, 2023, 8:29 a.m. UTC using the form documented at
the form documented at
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
<br>
@@ -48,8 +40,8 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<entrance>
<entranceslug>1623-2023-ASH-05a</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
<!-- DEBUG 1623-2023-ASH-05+1623-2023-ASH-05a 'Z' =a= -->
<letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. -->
<!-- DEBUG 1623-2023-ASH-05+1623-2023-ASH-05a 'Z' == -->
<letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. -->
</entrance>
<entrance>

12
entrance_data/1623-2023-ASH-05a.html
View File

@@ -1,10 +1,6 @@
<!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)
<!-- This file is generated by troggle on Aug. 4, 2023, 8:29 a.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- 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 -->
@@ -18,11 +14,7 @@ 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)
<b>This file is generated by troggle</b> on Aug. 4, 2023, 8:29 a.m. UTC using the form documented at
<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
<br>
<entrance>