chore(release): publish

- @standardnotes/api@1.26.11
 - @standardnotes/clipper@1.1.48
 - @standardnotes/desktop@3.106.57
 - @standardnotes/encryption@1.21.39
 - @standardnotes/filepicker@1.28.48
 - @standardnotes/files@1.15.10
 - @standardnotes/icons@1.12.0
 - @standardnotes/mobile@3.53.57
 - @standardnotes/models@1.46.0
 - @standardnotes/releases@1.4.325
 - @standardnotes/services@1.60.0
 - @standardnotes/snjs@2.169.0
 - @standardnotes/styles@1.8.0
 - @standardnotes/toast@1.3.32
 - @standardnotes/ui-services@1.26.15
 - @standardnotes/utils@1.17.0
 - @standardnotes/web@3.162.0

packages/icons/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.12.0](https://github.com/standardnotes/app/compare/@standardnotes/icons@1.11.0...@standardnotes/icons@1.12.0) (2023-06-25)
+
+### Features
+
+* Added a conflict resolution dialog and a Conflicts view for easier management of conflicts ([#2337](https://github.com/standardnotes/app/issues/2337)) ([e0e9249](https://github.com/standardnotes/app/commit/e0e92493342b18560e7e55ece22518e738824df0))
+
 # [1.11.0](https://github.com/standardnotes/app/compare/@standardnotes/icons@1.10.11...@standardnotes/icons@1.11.0) (2023-05-17)
 
 ### Features

packages/icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/icons",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "private": true,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",