Merge branch 'devel' of https://gl.mathhub.info/FrameIT/frameworld into devel

4db27773 · Lucas-He · 19f9d797 · 772baca7 · 19f9d797 · 19f9d797
Commit 4db27773 authored 1 year ago by Lucas-He
--- a/narration/Scrolls/CircleScroll.omdoc
+++ b/narration/Scrolls/CircleScroll.omdoc
--- a/narration/Scrolls/ConeVolumeScroll.omdoc
+++ b/narration/Scrolls/ConeVolumeScroll.omdoc
--- a/narration/Scrolls/CylinderScroll.omdoc
+++ b/narration/Scrolls/CylinderScroll.omdoc
--- a/narration/Scrolls/InterceptTheorem.omdoc
+++ b/narration/Scrolls/InterceptTheorem.omdoc
--- a/narration/Scrolls/MiscScrolls.omdoc
+++ b/narration/Scrolls/MiscScrolls.omdoc
--- a/narration/Scrolls/ParallelLines.omdoc
+++ b/narration/Scrolls/ParallelLines.omdoc
--- a/narration/Scrolls/PlaneLineAngleScroll.omdoc
+++ b/narration/Scrolls/PlaneLineAngleScroll.omdoc
--- a/narration/Scrolls/SupplementaryAngles.omdoc
+++ b/narration/Scrolls/SupplementaryAngles.omdoc
--- a/narration/Scrolls/TriangleScrolls.omdoc
+++ b/narration/Scrolls/TriangleScrolls.omdoc
--- a/narration/Scrolls/TriangulationFunction.omdoc
+++ b/narration/Scrolls/TriangulationFunction.omdoc
--- a/narration/examples/misc.omdoc
+++ b/narration/examples/misc.omdoc
--- a/relational/.rel
+++ b/relational/.rel
--- a/relational/DefaultSituationSpace.rel
+++ b/relational/DefaultSituationSpace.rel
--- a/relational/IntegrationTests/.rel
+++ b/relational/IntegrationTests/.rel
--- a/relational/IntegrationTests/CloseGapsTests.rel
+++ b/relational/IntegrationTests/CloseGapsTests.rel
--- a/relational/IntegrationTests/ExpectedTypeTests.rel
+++ b/relational/IntegrationTests/ExpectedTypeTests.rel
--- a/relational/IntegrationTests/SituationTheory.rel
+++ b/relational/IntegrationTests/SituationTheory.rel
--- a/relational/IntegrationTests/thy-parameter-bug.rel
+++ b/relational/IntegrationTests/thy-parameter-bug.rel
--- a/relational/Library/.rel
+++ b/relational/Library/.rel
--- a/relational/Library/gearbox.rel
+++ b/relational/Library/gearbox.rel