Whoops, remove conflict marker
This commit is contained in:
parent
48fc89ca88
commit
1ebf2bab1c
@ -35,7 +35,6 @@ Fixed
|
|||||||
- Adjust error message to point out QtWebEngine is unsupported with the OS
|
- Adjust error message to point out QtWebEngine is unsupported with the OS
|
||||||
X .app currently.
|
X .app currently.
|
||||||
- Hide Harfbuzz warning with the OS X .app
|
- Hide Harfbuzz warning with the OS X .app
|
||||||
>>>>>>> 95d1721... Release v0.8.1
|
|
||||||
|
|
||||||
v0.8.0
|
v0.8.0
|
||||||
------
|
------
|
||||||
|
Loading…
Reference in New Issue
Block a user