Merge branch 'devel' into 'master'

Resolve External Issue See merge request !91

Merge branch 'devel' into 'master'
bb28c1d7 · Andrey Sapronov · 864492b1 · 9464bd27 · bb28c1d7 · bb28c1d7
Commit bb28c1d7 authored Dec 25, 2017 by Andrey Sapronov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -1

lhapdf_dum.f src/lhapdf_dum.f +2 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
  - nightly

 before_script:
-  - yum -y install which yaml-cpp
+  - yum -y install which  yaml-cpp-devel libyaml-devel
  - . ./scripts/setup.sh
  - ./scripts/install-deps.sh


--- a/src/lhapdf_dum.f
+++ b/src/lhapdf_dum.f
@@ -9,7 +9,8 @@ c----------------------------------------------------------
      return
      end

-      subroutine checkforpdf()                                                                                                        end           
+      subroutine checkforpdf
+      end           
      
      subroutine initpdfsetbyname(a)
      call print_lhapdf_messg