[folly] fix conflicts

microsoft · Sep 19, 2024 · f652c94 · f652c94
1 parent a7a6f25
commit f652c94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2842,7 +2842,7 @@
     },
     "folly": {
       "baseline": "2024.09.16.00",
-      "port-version": 0
+      "port-version": 1
     },
     "font-chef": {
       "baseline": "1.1.0",

diff --git a/versions/f-/folly.json b/versions/f-/folly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1240ab18398982f4a1f4c4cd9bd7f1cdf63f6664",
+      "version-string": "2024.09.16.00",
+      "port-version": 1
+    },
     {
       "git-tree": "bdb6486a9cc0a710f19f521818547b7e0402e611",
       "version-string": "2024.09.16.00",