vMerge branch 'dev' of https://gitea.272401.com/admin/test into dev

2025-11-26 14:04:17 +08:00
parent 400a893446 1e4729682d
commit c716c2c651
3 changed files with 29 additions and 0 deletions
--- a/TeklaModelPlugin1.csproj
+++ b/TeklaModelPlugin1.csproj
@@ -72,6 +72,11 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Class1.cs" />
+    <Compile Include="Class2.cs" />
+<<<<<<< HEAD
+    <Compile Include="Class3.cs" />
+=======
+>>>>>>> b7c1fcc32251410c3e92daeca8fbcf4cab2d984e
    <Compile Include="ModelPlugin.cs" />
    <Compile Include="MainForm.cs">
      <SubType>Form</SubType>