diff --git a/CHANGELOG.md b/CHANGELOG.md index 701eeee37..e4a7edbc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.91.0-epic-ras-acc.2](https://github.com/Automattic/newspack-theme/compare/v1.91.0-epic-ras-acc.1...v1.91.0-epic-ras-acc.2) (2024-07-08) + + +### Bug Fixes + +* **ras-acc:** clean up merge conflict marker ([#2335](https://github.com/Automattic/newspack-theme/issues/2335)) ([080e0fc](https://github.com/Automattic/newspack-theme/commit/080e0fc1a8e59f70fef23b7a46b11dc6f85bcf11)) + # [1.91.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v1.90.3...v1.91.0-epic-ras-acc.1) (2024-07-03) diff --git a/newspack-joseph/sass/theme-description.scss b/newspack-joseph/sass/theme-description.scss index 2589a2e14..07cbe0ce7 100644 --- a/newspack-joseph/sass/theme-description.scss +++ b/newspack-joseph/sass/theme-description.scss @@ -5,7 +5,7 @@ Author: Automattic Author URI: https://newspack.com Description: Requires at least: WordPress 4.9.6 -Version: 1.91.0-epic-ras-acc.1 +Version: 1.91.0-epic-ras-acc.2 License: GNU General Public License v2 or later License URI: LICENSE Template: newspack-theme diff --git a/newspack-katharine/sass/theme-description.scss b/newspack-katharine/sass/theme-description.scss index e0c98a5ba..e662cd508 100644 --- a/newspack-katharine/sass/theme-description.scss +++ b/newspack-katharine/sass/theme-description.scss @@ -5,7 +5,7 @@ Author: Automattic Author URI: https://newspack.com Description: Requires at least: WordPress 4.9.6 -Version: 1.91.0-epic-ras-acc.1 +Version: 1.91.0-epic-ras-acc.2 License: GNU General Public License v2 or later License URI: LICENSE Template: newspack-theme diff --git a/newspack-nelson/sass/theme-description.scss b/newspack-nelson/sass/theme-description.scss index 154562877..f95731a2b 100644 --- a/newspack-nelson/sass/theme-description.scss +++ b/newspack-nelson/sass/theme-description.scss @@ -5,7 +5,7 @@ Author: Automattic Author URI: https://newspack.com Description: Requires at least: WordPress 4.9.6 -Version: 1.91.0-epic-ras-acc.1 +Version: 1.91.0-epic-ras-acc.2 License: GNU General Public License v2 or later License URI: LICENSE Template: newspack-theme diff --git a/newspack-sacha/sass/theme-description.scss b/newspack-sacha/sass/theme-description.scss index f50c327fe..e18d481d0 100644 --- a/newspack-sacha/sass/theme-description.scss +++ b/newspack-sacha/sass/theme-description.scss @@ -5,7 +5,7 @@ Author: Automattic Author URI: https://newspack.com Description: Requires at least: WordPress 4.9.6 -Version: 1.91.0-epic-ras-acc.1 +Version: 1.91.0-epic-ras-acc.2 License: GNU General Public License v2 or later License URI: LICENSE Template: newspack-theme diff --git a/newspack-scott/sass/theme-description.scss b/newspack-scott/sass/theme-description.scss index becef0116..48fca934c 100644 --- a/newspack-scott/sass/theme-description.scss +++ b/newspack-scott/sass/theme-description.scss @@ -5,7 +5,7 @@ Author: Automattic Author URI: https://newspack.com Description: Requires at least: WordPress 4.9.6 -Version: 1.91.0-epic-ras-acc.1 +Version: 1.91.0-epic-ras-acc.2 License: GNU General Public License v2 or later License URI: LICENSE Template: newspack-theme diff --git a/newspack-theme/sass/theme-description.scss b/newspack-theme/sass/theme-description.scss index 36669584b..309f6a74b 100644 --- a/newspack-theme/sass/theme-description.scss +++ b/newspack-theme/sass/theme-description.scss @@ -5,7 +5,7 @@ Author: Automattic Author URI: https://newspack.com Description: Requires at least: WordPress 4.9.6 -Version: 1.91.0-epic-ras-acc.1 +Version: 1.91.0-epic-ras-acc.2 License: GNU General Public License v2 or later License URI: LICENSE Text Domain: newspack diff --git a/package-lock.json b/package-lock.json index f8c124d85..d02c5c514 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "newspack", - "version": "1.91.0-epic-ras-acc.1", + "version": "1.91.0-epic-ras-acc.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "newspack", - "version": "1.91.0-epic-ras-acc.1", + "version": "1.91.0-epic-ras-acc.2", "dependencies": { "regenerator-runtime": "^0.14.1" }, diff --git a/package.json b/package.json index 2dbbe5a9d..71adfaf67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "newspack", - "version": "1.91.0-epic-ras-acc.1", + "version": "1.91.0-epic-ras-acc.2", "description": "A theme for Newspack. https://newspack.com", "bugs": { "url": "https://github.com/Automattic/newspack-theme/issues"