From 4e0cbeee1f07e048d3857876ffa20456fb26f3cf Mon Sep 17 00:00:00 2001
From: remi rativel <remi.rativel@kereval.com>
Date: Fri, 10 Jan 2025 10:24:20 +0100
Subject: [PATCH] removed git conflict note

---
 Schematron-Validator/release-note.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Schematron-Validator/release-note.md b/Schematron-Validator/release-note.md
index e925dba..722e40c 100755
--- a/Schematron-Validator/release-note.md
+++ b/Schematron-Validator/release-note.md
@@ -8,8 +8,6 @@ function: Software Engineer
 customer: IHE Europe
 reference: KER1-RNO-IHE-SCHEMATRON_VALIDATOR
 ---
-<<<<<<< Updated upstream
-=======
 
 # 2.6.2
 
@@ -19,8 +17,7 @@ __Feature__
 
 * \[[SCHVAL-197](https://gazelle.ihe.net/jira/browse/SCHVAL-197)\] Add a compilation timestamp column in 
 Manage Schematron view
-
->>>>>>> Stashed changes
+* 
 # 2.6.1
 _Release date: 2024-02-26_
 
-- 
GitLab