Mercurial > hg > orthanc-databases

changeset 659:917629011a86 attach-custom-data

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix merge
author Alain Mazy <am@orthanc.team>
date Mon, 19 May 2025 16:12:25 +0200
parents 12861c70239a
children a40b6b48dbcd
files PostgreSQL/Plugins/SQL/Upgrades/Rev3ToRev4.sql
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;