From 750b110b01a8daadc4b8394c40991cefefcfa0b0 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 24 Oct 2024 15:15:57 -0600 Subject: [PATCH 1/3] fix cla --- .github/workflows/cla.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 34a5c35..d060235 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -1,10 +1,17 @@ name: CLA Assistant on: +<<<<<<< Updated upstream issue_comment: types: [created] pull_request_target: types: [opened, closed, synchronize] +======= + issue_comment: + types: [created] + pull_request_target: + types: [opened, synchronize] +>>>>>>> Stashed changes jobs: CLA: From 196e0227e95912567437d284eb8665736e8a59c0 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 24 Oct 2024 15:20:23 -0600 Subject: [PATCH 2/3] fix conflict --- .github/workflows/cla.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index d060235..86fb3b1 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -1,17 +1,10 @@ name: CLA Assistant on: -<<<<<<< Updated upstream - issue_comment: - types: [created] - pull_request_target: - types: [opened, closed, synchronize] -======= issue_comment: types: [created] pull_request_target: types: [opened, synchronize] ->>>>>>> Stashed changes jobs: CLA: From 5fd03411d614c290800fe366a68c1b753d7bdba2 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 24 Oct 2024 15:21:31 -0600 Subject: [PATCH 3/3] fix lint --- .github/workflows/cla.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 86fb3b1..dc4de9e 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -1,10 +1,10 @@ name: CLA Assistant on: - issue_comment: - types: [created] - pull_request_target: - types: [opened, synchronize] + issue_comment: + types: [created] + pull_request_target: + types: [opened, synchronize] jobs: CLA: