chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Edited Release Notes to clean conflict warning

Browse Source
This commit is contained in:
Arie Klerk 2020-09-10 10:37:23 +02:00
parent fffa7a1383
commit 62ab4773e1
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Htmldocs/release_notes.html
View File

@ -8,12 +8,9 @@
</head> </head>
<body> <body>
<p> <p>
<<<<<<< HEAD
<b>For other languages, go to:</b> <b>For other languages, go to:</b>
<br>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</p> <br>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</p>
<p> <p>
<b>Changes and fixes in OSCAR v1.2.0</b>
=======
<b>Changes and fixes in OSCAR v1.2.0-beta-2</b> <b>Changes and fixes in OSCAR v1.2.0-beta-2</b>
<br>Portions of OSCAR are © 2019-2020 by <br>Portions of OSCAR are © 2019-2020 by
<i>The OSCAR Team</i></p> <i>The OSCAR Team</i></p>
@ -28,7 +25,6 @@
</ul></p> </ul></p>
<p> <p>
<b>Changes and fixes in OSCAR v1.2.0-beta-1</b> <b>Changes and fixes in OSCAR v1.2.0-beta-1</b>
>>>>>>> e39adbd41ec60e2787e34a840afdfa1114baba19
<br>Portions of OSCAR are © 2019-2020 by <br>Portions of OSCAR are © 2019-2020 by
<i>The OSCAR Team</i></p> <ul> <i>The OSCAR Team</i></p> <ul>
<li>[new] Support for Chromebooks using Linux beta - (Intel/AMD only)</li> <li>[new] Support for Chromebooks using Linux beta - (Intel/AMD only)</li>