diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cdf7760..82f0e40d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.1.4](https://github.com/googleapis/code-suggester/compare/v2.1.3...v2.1.4) (2022-02-23) + + +### Bug Fixes + +* try to merge the upstream repo branch on the fork ([#330](https://github.com/googleapis/code-suggester/issues/330)) ([2d5c3f9](https://github.com/googleapis/code-suggester/commit/2d5c3f9dd55804fa7e9aa0b776e238cb71776029)), closes [#335](https://github.com/googleapis/code-suggester/issues/335) + ### [2.1.3](https://github.com/googleapis/code-suggester/compare/v2.1.2...v2.1.3) (2022-02-22) diff --git a/package-lock.json b/package-lock.json index 68223108..7ff61e1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "code-suggester", - "version": "2.1.3", + "version": "2.1.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a988edc8..d4ea6033 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-suggester", "description": "Library to propose code changes", - "version": "2.1.3", + "version": "2.1.4", "license": "Apache-2.0", "author": "Google LLC", "engines": {