Mercurial > hg > orthanc

diff NEWS @ 5808:63c025cf6958 attach-custom-data

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup
author Alain Mazy <am@orthanc.team>
date Tue, 24 Sep 2024 12:11:25 +0200
parents 8279eaab0d1d
children 023a99146dd0
line wrap: on
line diff
--- a/NEWS	Tue Sep 24 11:39:52 2024 +0200
+++ b/NEWS	Tue Sep 24 12:11:25 2024 +0200
@@ -1,7 +1,6 @@
 Pending changes in the mainline
 ===============================
 
-<<<<<<< working copy
 General
 -------
 
@@ -18,8 +17,6 @@
 * New storage plugin SDK (v3) to handle customData for attachments,
 
 
-version 1.11.2 (2022-08-30)
-=======
 REST API
 -----------
 
@@ -399,7 +396,6 @@
 
 
 Version 1.11.2 (2022-08-30)
->>>>>>> merge rev
 ===========================
 
 General