Merge branch 'DP1-Convert-Floorplan-To-TypeScript' into main

# Conflicts: # .gitignore
2021-11-09 17:43:03 +10:00
parent 500132c4cb c17f06f817
commit f933cac2d1
3 changed files with 4 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 /node_modules/
 /bin/
 /obj/
 *.dll
 *.xml
 /tables/*
--- a/DredgePos.fsproj
+++ b/DredgePos.fsproj
@@ -61,6 +61,7 @@
      <Content Include="xslt\orderXMLtoHTML.xslt" />
      <Content Include="xslt\orderHtmltoXML.xslt" />
      <Content Include="xslt\htmlToEscPos.xslt" />
      <Content Include=".gitignore" />
    </ItemGroup>
    <ItemGroup>
--- a/wwwroot/scripts/ts/test.ts
+++ b/wwwroot/scripts/ts/test.ts
@@ -1 +0,0 @@