Skip to content

Commit

Permalink
chore(main): release 1.1.0 (#49)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] committed Apr 18, 2023
1 parent c3c8674 commit f2ed4dc
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Changelog

## [1.1.0](https://github.com/akinsho/git-conflict.nvim/compare/v1.0.0...v1.1.0) (2023-04-18)


### Features

* add option to disable commands ([#35](https://github.com/akinsho/git-conflict.nvim/issues/35)) ([77faa75](https://github.com/akinsho/git-conflict.nvim/commit/77faa75c09a6af88e7b54d8d456327e06611f7ea))
* user mappings config ([#42](https://github.com/akinsho/git-conflict.nvim/issues/42)) ([c92604a](https://github.com/akinsho/git-conflict.nvim/commit/c92604a64a2cce15a6e6a753f4501bcee06fa00a))


### Bug Fixes

* **color:** reset the color after colorscheme was changed ([#39](https://github.com/akinsho/git-conflict.nvim/issues/39)) ([#40](https://github.com/akinsho/git-conflict.nvim/issues/40)) ([cbefa70](https://github.com/akinsho/git-conflict.nvim/commit/cbefa7075b67903ca27f6eefdc9c1bf0c4881017))
* ensure valid value is passed when opening QF ([2957f74](https://github.com/akinsho/git-conflict.nvim/commit/2957f747e1a34f1854e4e0efbfbfa59a1db04af5))

0 comments on commit f2ed4dc

Please sign in to comment.