fixing action

achieve-3000 · Sep 20, 2024 · 5e32ff4 · 5e32ff4
2 parents 812d74c + 7d9ea56
commit 5e32ff4
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.github/workflows/repo-migrate.yaml b/.github/workflows/repo-migrate.yaml
@@ -5,7 +5,11 @@ on:
 
 jobs:
   migrate:
+<<<<<<< HEAD
     runs-on: [ubuntu-latest]
+=======
+    runs_on: [ubuntu-latest]
+>>>>>>> 7d9ea562e89a6a87f61a791820a758b0a776eb0b
     steps:
       - name: Migrate Repo
         uses: achieve-3000/ghe-migration-scripts/migrate-repo@v1
@@ -16,7 +20,11 @@ jobs:
           source_token: ${{ secrets.CI_PAT }}
           target_token: ${{ secrets.GH_MIGRATION_TOKEN }}
   migrate-secrets:
+<<<<<<< HEAD
     runs-on: [ ubuntu-latest ]
+=======
+    runs_on: [ ubuntu-latest ]
+>>>>>>> 7d9ea562e89a6a87f61a791820a758b0a776eb0b
     steps:
       - name: Migrate Secrets
         uses: achieve-3000/ghe-migration-scripts/migrate-secrets@v1