fixing merge conflicts

This commit is contained in:
afeiszli
2021-09-23 12:13:09 -04:00
32 changed files with 145 additions and 610 deletions

View File

@@ -455,6 +455,13 @@
<a href="client-installation.html#introduction-to-netclient" class="md-nav__link">Introduction to Netclient</a>
</li>
<li class="md-nav__item">
<a href="client-installation.html#notes-on-windows" class="md-nav__link">Notes on Windows</a>
</li>
<li class="md-nav__item">