Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 4e0cbeee authored by remi rativel's avatar remi rativel
Browse files

removed git conflict note

parent fab38375
No related branches found
No related tags found
No related merge requests found
...@@ -8,8 +8,6 @@ function: Software Engineer ...@@ -8,8 +8,6 @@ function: Software Engineer
customer: IHE Europe customer: IHE Europe
reference: KER1-RNO-IHE-SCHEMATRON_VALIDATOR reference: KER1-RNO-IHE-SCHEMATRON_VALIDATOR
--- ---
<<<<<<< Updated upstream
=======
# 2.6.2 # 2.6.2
...@@ -19,8 +17,7 @@ __Feature__ ...@@ -19,8 +17,7 @@ __Feature__
* \[[SCHVAL-197](https://gazelle.ihe.net/jira/browse/SCHVAL-197)\] Add a compilation timestamp column in * \[[SCHVAL-197](https://gazelle.ihe.net/jira/browse/SCHVAL-197)\] Add a compilation timestamp column in
Manage Schematron view Manage Schematron view
*
>>>>>>> Stashed changes
# 2.6.1 # 2.6.1
_Release date: 2024-02-26_ _Release date: 2024-02-26_
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment