v1.1

JetterMcTedder · Aug 12, 2022 · 1261f24 · 1261f24
2 parents 857d2d1 + 42b6766
commit 1261f24
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/DevOpsDemo/DevOpsDemo.sqlproj b/DevOpsDemo/DevOpsDemo.sqlproj
@@ -37,12 +37,18 @@
     <Folder Include="Person\Schemas\" />
     <Folder Include="Person\Tables\" />
     <Folder Include="pre\tsqltsetup\" />
+<<<<<<< HEAD
     <Folder Include="post\" />
   </ItemGroup>
   <ItemGroup>
     <PreDeploy Include="pre\tsqltsetup\tSQLt.class.sql" />
   </ItemGroup>
   <ItemGroup>
     <PostDeploy Include="post\Script.PostDeployment1.sql" />
+=======
+  </ItemGroup>
+  <ItemGroup>
+    <PreDeploy Include="pre\tsqltsetup\tSQLt.class.sql" />
+>>>>>>> 42b6766575ed38847dd991edc8c3e78e0cc14750
   </ItemGroup>
 </Project>