This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push: new 2de2c7a42 chore: ignore resources.go 2de2c7a42 is described below commit 2de2c7a42378c3bb23d503fd2c705796174063f0 Author: Pasquale Congiusti <pasquale.congiu...@gmail.com> AuthorDate: Wed May 10 09:59:04 2023 +0200 chore: ignore resources.go The file is autogenerated at each build, and is a source of conflict. We better ignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2928a8222..42d3fa167 100644 --- a/.gitignore +++ b/.gitignore @@ -175,3 +175,4 @@ config/**/*.gen.json # Fabric8 CRDs java/target +pkg/resources/resources.go