Whoops, remove conflict marker

This commit is contained in:
Florian Bruhin 2016-07-27 12:42:22 +02:00
parent 04aa98d7fb
commit d8153f7010

View File

@ -35,7 +35,6 @@ Fixed
- Adjust error message to point out QtWebEngine is unsupported with the OS
X .app currently.
- Hide Harfbuzz warning with the OS X .app
>>>>>>> 95d1721... Release v0.8.1
v0.8.0
------