Skip to content

Commit e5086f7

Browse files
ebeahanmergify[bot]
authored andcommitted
Remove exception for dev-tools/integration/.env (#5693)
(cherry picked from commit e9366da) # Conflicts: # .github/CODEOWNERS
1 parent 71d2eb4 commit e5086f7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Team responsible for Fleet Server
22
* @elastic/elastic-agent-control-plane
33

4+
<<<<<<< HEAD
45
# Allow to auto-merge PRs with Mergify
56
dev-tools/integration/.env
7+
=======
8+
>>>>>>> e9366da (Remove exception for dev-tools/integration/.env (#5693))
69
/.github/workflows @elastic/observablt-ci
710
/.github/workflows/golangci-lint.yml @elastic/elastic-agent-control-plane
811
/docs/release-notes @elastic/ingest-docs

0 commit comments

Comments
 (0)