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

Class2.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TeklaModelPlugin1
+{
+    internal class Class2
+    {
+    }
+}

Class3.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TeklaModelPlugin1
+{
+    internal class Class3
+    {
+    }
+}

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>