From 62ab4773e143c8f918968ec8fd02121d5627b2eb Mon Sep 17 00:00:00 2001 From: Arie Klerk Date: Thu, 10 Sep 2020 10:37:23 +0200 Subject: [PATCH] Edited Release Notes to clean conflict warning --- Htmldocs/release_notes.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index 4b84ffdd..e6cd8d8e 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -8,12 +8,9 @@

-<<<<<<< HEAD For other languages, go to:
http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes

- Changes and fixes in OSCAR v1.2.0 -======= Changes and fixes in OSCAR v1.2.0-beta-2
Portions of OSCAR are © 2019-2020 by The OSCAR Team

@@ -28,7 +25,6 @@

Changes and fixes in OSCAR v1.2.0-beta-1 ->>>>>>> e39adbd41ec60e2787e34a840afdfa1114baba19
Portions of OSCAR are © 2019-2020 by The OSCAR Team