Resolve code conflicts

bcgov · Jan 28, 2025 · 1d8d50c · 1d8d50c
1 parent e47983c
commit 1d8d50c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ripts/versions/revert/v_57_ddl_revert.sql → ...ripts/versions/revert/v_58_ddl_revert.sql b/...ripts/versions/revert/v_57_ddl_revert.sql → ...ripts/versions/revert/v_58_ddl_revert.sql
@@ -22,7 +22,7 @@ GO
 DECLARE @VersionDescription VARCHAR(255)
 SET @VersionDescription = 'Reverting updates to support new vehicle types for TROS and TROW'
 
-INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (56, @VersionDescription, getutcdate())
+INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (57, @VersionDescription, getutcdate())
 GO
 
 IF @@ERROR <> 0 SET NOEXEC ON

diff --git a/database/mssql/scripts/versions/v_57_ddl.sql → database/mssql/scripts/versions/v_58_ddl.sql b/database/mssql/scripts/versions/v_57_ddl.sql → database/mssql/scripts/versions/v_58_ddl.sql
@@ -69,7 +69,7 @@ GO
 DECLARE @VersionDescription VARCHAR(255)
 SET @VersionDescription = 'Updates to support new vehicle types for TROS and TROW'
 
-INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [UPDATE_SCRIPT], [REVERT_SCRIPT], [RELEASE_DATE]) VALUES (57, @VersionDescription, '$(UPDATE_SCRIPT)', '$(REVERT_SCRIPT)', getutcdate())
+INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [UPDATE_SCRIPT], [REVERT_SCRIPT], [RELEASE_DATE]) VALUES (58, @VersionDescription, '$(UPDATE_SCRIPT)', '$(REVERT_SCRIPT)', getutcdate())
 IF @@ERROR <> 0 SET NOEXEC ON
 GO