# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1747663945 -7200
# Node ID 917629011a867df1065887a819372ebc0d4c5b72
# Parent  12861c70239ab4bc28f37150eb18ece695a7705a
fix merge

diff -r 12861c70239a -r 917629011a86 PostgreSQL/Plugins/SQL/Upgrades/Rev3ToRev4.sql
--- a/PostgreSQL/Plugins/SQL/Upgrades/Rev3ToRev4.sql	Wed Mar 12 12:11:40 2025 +0100
+++ b/PostgreSQL/Plugins/SQL/Upgrades/Rev3ToRev4.sql	Mon May 19 16:12:25 2025 +0200
@@ -1,2 +1,2 @@
 -- everything is performed in PrepareIndex.sql
-SELECT 1;>>>>>>> merge rev
+SELECT 1;