chore(release): v3.0.0-beta.17 [skip ci]

reactioncommerce · Jul 13, 2021 · fb25729 · fb25729
1 parent a1da711
commit fb25729
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [3.0.0-beta.17](https://github.com/reactioncommerce/reaction-admin/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2021-07-13)
+
+
+### Bug Fixes
+
+* merge conflict ([73e4f01](https://github.com/reactioncommerce/reaction-admin/commit/73e4f01adfb05fb139f2458c685da4b265ed8221))
+
 # [3.0.0-beta.16](https://github.com/reactioncommerce/reaction-admin/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2021-07-11)
 
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ networks:
 
 services:
   reaction-admin:
-    image: reactioncommerce/admin:3.0.0-beta.16
+    image: reactioncommerce/admin:3.0.0-beta.17
     env_file:
       - ./.env
     networks:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "reaction-admin",
   "description": "Reaction is a modern reactive, real-time event driven ecommerce platform.",
-  "version": "3.0.0-beta.16",
+  "version": "3.0.0-beta.17",
   "main": "main.js",
   "release": {
     "branches": [