Commit 704807c3 authored by Sergio Gonzalez Diaz's avatar Sergio Gonzalez Diaz
Browse files

Resolve conflicts merge

parent 1bae9d07

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ stages: 
include: 

  - local: '/manifests/.gitlab-ci.yml'

  - local: '/src/monitoring/.gitlab-ci.yml'

  - local: '/src/centralizedattackdetector/.gitlab-ci.yml'

  # - local: '/src/centralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'

  - local: '/src/service/.gitlab-ci.yml'