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

# Conflicts:
#	.gitignore
This commit is contained in:
dredgy committed 2021-11-09 17:43:03 +10:00
commit f933cac2d1
3 files changed
+4 -1

No files matched your search

+3
View File
@@ -1,3 +1,6 @@
/node_modules/ /node_modules/
/bin/ /bin/
/obj/ /obj/
*.dll
*.xml
/tables/*
+1
View File
@@ -61,6 +61,7 @@
<Content Include="xslt\orderXMLtoHTML.xslt" /> <Content Include="xslt\orderXMLtoHTML.xslt" />
<Content Include="xslt\orderHtmltoXML.xslt" /> <Content Include="xslt\orderHtmltoXML.xslt" />
<Content Include="xslt\htmlToEscPos.xslt" /> <Content Include="xslt\htmlToEscPos.xslt" />
<Content Include=".gitignore" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
-1
View File
@@ -1 +0,0 @@