confdroid/confdroid_apache
3
0
Fork 0
Code Issues Projects Wiki Activity

EN-0001 - add new stages

Browse Source
This commit is contained in:
Arne Teuke
2021-08-05 16:07:55 +02:00
parent ed0e623930
commit 4e3682f6a8
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@@ -15,10 +15,7 @@ gem 'rgen'
gem 'public_suffix', '<= 2.0.5' gem 'public_suffix', '<= 2.0.5'
gem 'parallel', '<= 1.13.0' gem 'parallel', '<= 1.13.0'
gem 'puppet-syntax', '~> 2.6', '>= 2.6.1' gem 'puppet-syntax', '~> 2.6', '>= 2.6.1'
<<<<<<< HEAD
gem 'pathspec', '~> 0.2.1' gem 'pathspec', '~> 0.2.1'
=======
>>>>>>> fff4fbb07cecdaeee187b4566e948ac1794dc6e8
# rspec must be v2 for ruby 1.8.7 # rspec must be v2 for ruby 1.8.7
if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'