mirror of
https://github.com/desktop/desktop
synced 2024-09-19 08:02:22 +00:00
fix bad merge
This commit is contained in:
parent
340b489d61
commit
c47993d3f5
|
@ -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": [
|
||||
],
|
||||
|
|
Loading…
Reference in a new issue