Merge pull request #1105 from lightbend/fix_parent_circleci

chore: restoring parent branch in circleci
lightbend · Sep 11, 2022 · cc6048b · cc6048b
2 parents bb99c86 + d71ce01
commit cc6048b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ commands:
             git config user.email "[email protected]"
             git config user.name "CircleCI"
       - build-tools/merge-with-parent:
-          parent: spring-sdk # we need to revert this when merging back into main
+          parent: main
 
   install-java-11:
     description: install openjdk-11