syncpack

spmonahan · Apr 18, 2024 · 802ffdd · 802ffdd
1 parent 0cc53fe
commit 802ffdd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/packages/react-examples/package.json b/packages/react-examples/package.json
@@ -43,7 +43,7 @@
     "@fluentui/react-focus": "^8.8.44",
     "@fluentui/react-hooks": "^8.7.2",
     "@fluentui/react-icons-mdl2": "^1.3.61",
-    "@fluentui/react-window-provider": "^2.2.19",
+    "@fluentui/react-window-provider": "^2.2.20",
     "@fluentui/scheme-utilities": "^8.3.46",
     "@fluentui/style-utilities": "^8.10.7",
     "@fluentui/theme": "^2.6.45",

diff --git a/packages/utilities/package.json b/packages/utilities/package.json
@@ -40,17 +40,10 @@
     "@fluentui/scripts-tasks": "*"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@fluentui/dom-utilities": "^2.2.16",
     "@fluentui/merge-styles": "^8.6.2",
     "@fluentui/set-version": "^8.2.16",
-    "@fluentui/react-window-provider": "^2.2.18",
-=======
-    "@fluentui/dom-utilities": "^2.2.15",
-    "@fluentui/merge-styles": "^8.6.1",
-    "@fluentui/set-version": "^8.2.15",
-    "@fluentui/react-window-provider": "^2.2.19",
->>>>>>> syncpack
+    "@fluentui/react-window-provider": "^2.2.20",
     "tslib": "^2.1.0"
   },
   "peerDependencies": {