X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=.pre-commit-config.yaml;fp=.pre-commit-config.yaml;h=64886a158c9afdac2a7edb73a2afb334fff4ad5d;hb=39de3404b2681d425af82a66f7f665ecd4a2da3a;hp=7e3b989d90098f169c8eb07380356571e9d9217d;hpb=05c0ca3745d9fe5f9be21f9a1624f99983f9c13b;p=integration%2Ftest.git

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7e3b989d90..64886a158c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,6 +7,9 @@ repos:
         language_version: python3
         additional_dependencies: ['flake8~=3.5.0']
       - id: trailing-whitespace
+        # this hook will remove any blank lines at the end of a file, whereas the robot hook will add one
+        # so to prevent this conflict we will ignore .robot files in this trailing-whitespace hook
+        exclude: '\.robot'
 
   - repo: https://github.com/pre-commit/mirrors-autopep8
     rev: v1.4.4