fix bad merge

This commit is contained in:
Brendan Forster 2018-05-23 14:18:16 +10:00
parent 340b489d61
commit c47993d3f5

View file

@ -36,7 +36,6 @@
"[Improved] Commit summary now has a hint to indicate why committing is disabled - #4429.",
"[Improved] Pull request status text now matches format on GitHub - #3521",
"[Improved] Add escape hatch to disable hardware acceleration when launching - #3921"
>>>>>>> master
],
"1.1.2-beta7": [
],