Skip to content

Commit ead1134

Browse files
committed
Chromium based webapps. Utils update
1 parent 21dcf70 commit ead1134

File tree

2 files changed

+1
-82
lines changed

2 files changed

+1
-82
lines changed

.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
use nix
1+
use nix --impure
22
layout python3

docs/mkdocs-base.yml

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ copyright: Copyright Tim Sutton and Contributors, 2022
1212

1313

1414
nav:
15-
<<<<<<< HEAD
1615
- Home:
1716
- Home: index.md
1817
- Code of Conduct: about/code-of-conduct.md
@@ -22,7 +21,6 @@ nav:
2221
- User:
2322
- user/index.md
2423
- Quickstart:
25-
- user/quickstart/index.md
2624
- Installation: user/quickstart/install.md
2725
- Initial Configuration: user/quickstart/configure.md
2826
- Using the Workbench: user/quickstart/using.md
@@ -41,54 +39,6 @@ nav:
4139
- Expression Examples: user/manual/snippets.md
4240
- Under the hood: user/manual/under_the_hood.md
4341
- FAQ: user/manual/faq.md
44-
- Developer:
45-
- developer/index.md
46-
- Guide:
47-
- developer/guide/index.md
48-
- Architecture: developer/guide/architecture.md
49-
- Prerequisites: developer/guide/prerequisites.md
50-
- Design: developer/guide/design.md
51-
- IDE Setup: developer/guide/ide-setup.md
52-
- Cloning: developer/guide/cloning.md
53-
- Configuration: developer/guide/configuration.md
54-
- Building: developer/guide/building.md
55-
- Workflows: developer/guide/workflows.md
56-
- Testing: developer/guide/testing.md
57-
- Manual:
58-
- developer/manual/index.md
59-
- Documentation Writing:
60-
- developer/documentation/index.md
61-
- Overview: developer/documentation/overview.md
62-
- Context Help: developer/documentation/context-help.md
63-
64-
||||||| 5ec0741
65-
- Home:
66-
- Home: index.md
67-
- Code of Conduct: about/code-of-conduct.md
68-
- Contribute: about/contribute.md
69-
- License: about/license.md
70-
- Credits: about/credits.md
71-
- User:
72-
- user/index.md
73-
- Quickstart:
74-
- Installation: user/quickstart/install.md
75-
- Initial Configuration: user/quickstart/configure.md
76-
- Using the Workbench: user/quickstart/using.md
77-
- Guide:
78-
- user/guide/index.md
79-
- 1 Points on a Line: user/guide/tutorial1.md
80-
- 2 Dynamic Markers: user/guide/tutorial2.md
81-
- 3 Flying Points: user/guide/tutorial3.md
82-
- 4 Spinning Globe: user/guide/tutorial4.md
83-
- 5 Planar Map: user/guide/tutorial5.md
84-
- Manual:
85-
- user/manual/index.md
86-
- Preparing your project: user/manual/project_preparation.md
87-
- The workbench user interface: user/manual/workbench_ui.md
88-
- Expression Variables: library/variables.md
89-
- Expression Examples: library/snippets.md
90-
- Under the hood: user/manual/under_the_hood.md
91-
- FAQ: user/manual/faq.md
9242
- Developer:
9343
- developer/index.md
9444
- Guide:
@@ -121,34 +71,3 @@ nav:
12171
# - About: about/index.md
12272
# - License: about/license.md
12373
# - Contributing: about/contributing.md
124-
125-
=======
126-
- Home: index.md
127-
- Quickstart:
128-
- Installation: start/install.md
129-
- Initial Configuration: start/configure.md
130-
- Using the Workbench: start/using.md
131-
- Manual:
132-
- Preparing your project: manual/project_preparation.md
133-
- The workbench user interface: manual/workbench_ui.md
134-
- Under the hood: manual/under_the_hood.md
135-
- Tutorials:
136-
- QGIS: tutorials/index.md
137-
- 1 Points on a Line: tutorials/tutorial1.md
138-
- 2 Dynamic Markers: tutorials/tutorial2.md
139-
- 3 Flying Points: tutorials/tutorial3.md
140-
- 4 Spinning Globe: tutorials/tutorial4.md
141-
- 5 Planar Map: tutorials/tutorial5.md
142-
- Library:
143-
- Expression Variables: library/variables.md
144-
- Expression Examples: library/snippets.md
145-
- FAQ: faq/faq.md
146-
- Develop:
147-
- Setup: develop/setup.md
148-
- Design: develop/design.md
149-
- Documentation: develop/docs.md
150-
- Contribute:
151-
- Contribute: contribute/contribute.md
152-
- Credits:
153-
- Credits: credits/credits.md
154-
>>>>>>> 8a8d08a4bc35d732b1853cf6c4fcd466ed01191e

0 commit comments

Comments
 (0)