conflcits

aws · Sep 30, 2024 · eccec59 · eccec59
1 parent c8655b8
commit eccec59
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
@@ -142,12 +142,9 @@ The following json shows the current recommended set of flags, as `cdk init` wou
     "@aws-cdk/aws-s3:keepNotificationInImportedBucket": false,
     "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": true,
     "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": true,
-<<<<<<< HEAD
+    "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true,
+    "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true,
     "@aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics": true
-=======
-    "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true
-    "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true
->>>>>>> b0e4a544aecce86e8b41e7cd148a139c2e34bfbd
   }
 }
 ```