From c17529f5a6b5dab7114eb1c4e2d5c594a1d2d94c Mon Sep 17 00:00:00 2001
From: Mart van Santen <mart@greenhost.nl>
Date: Thu, 2 Dec 2021 02:28:52 +0100
Subject: [PATCH] Pylint merge trouble

---
 .gitlab-ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 209b16e..fd482a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -210,17 +210,17 @@ behave-integration:
 
 # TODO: Fix https://open.greenhost.net/stackspin/single-sign-on/-/issues/82
 #
-#pylint:
-#  stage: build
-#  variables:
-#    KANIKO_CONTEXT: "test/lint/pylint"
-#    KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
-#  extends: .kaniko_build
-#  only:
-#    changes:
-#      - test/lint/pylint/Dockerfile
-#      - test/lint/pylint/requirements.txt
-#      - .gitlab-ci.yml
+pylint:
+  stage: build
+  variables:
+    KANIKO_CONTEXT: "test/lint/pylint"
+    KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
+  extends: .kaniko_build
+  only:
+    changes:
+      - test/lint/pylint/Dockerfile
+      - test/lint/pylint/requirements.txt
+      - .gitlab-ci.yml
 #
 # pylint-lint:
 #   stage: lint
-- 
GitLab