Skip to content

Commit 174e29b

Browse files
committed
Merge branch 'main' into release/v1.5.1
# Conflicts: # Empty databases/openIMIS_ONLINE.sql # Migration script/openIMIS migration v1.4.2 - 1.5.0.sql
2 parents 678b153 + 00ff347 commit 174e29b

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

Empty databases/openIMIS_ONLINE.sql

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8473,7 +8473,7 @@ AS
84738473
BEGIN
84748474
DECLARE @oReturnValue as int
84758475
SET @oReturnValue = 0
8476-
--BEGIN TRY
8476+
BEGIN TRY
84778477

84788478
DECLARE @MStart as int
84798479
DECLARE @MEnd as int
@@ -8657,19 +8657,18 @@ BEGIN
86578657
FINISH:
86588658

86598659
RETURN @oReturnValue
8660-
/*END TRY
8660+
END TRY
86618661

86628662
BEGIN CATCH
86638663
SELECT 'Unexpected error encountered'
86648664
SET @oReturnValue = 1
86658665
SET @RtnStatus = 1
86668666
RETURN @oReturnValue
86678667

8668-
END CATCH*/
8668+
END CATCH
86698669

86708670
END
8671-
8672-
SET ANSI_NULLS ON
8671+
GO
86738672

86748673
SET ANSI_NULLS ON
86758674
GO

0 commit comments

Comments
 (0)