From 0ba3af7de89dcc8e08de2f85b099063493c60ce8 Mon Sep 17 00:00:00 2001 From: Markelov Anton Date: Mon, 3 Jun 2013 10:53:17 +1100 Subject: [PATCH] fix conflicts --- .travis.yml | 7 ------- Modulefile | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index c825f5e..a19074d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,6 @@ rvm: - 1.9.3 - ruby-head env: -<<<<<<< HEAD - - PUPPET_VERSION=3.0.1 - - PUPPET_VERSION=2.7.13 - - PUPPET_VERSION=2.7.6 - - PUPPET_VERSION=2.6.9 -======= - PUPPET_GEM_VERSION="~> 2.6.0" - PUPPET_GEM_VERSION="~> 2.7.0" - PUPPET_GEM_VERSION="~> 3.0.0" @@ -31,6 +25,5 @@ matrix: env: PUPPET_GEM_VERSION="~> 2.6.0" - rvm: ruby-head env: PUPPET_GEM_VERSION="~> 2.6.0" ->>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5 notifications: email: false diff --git a/Modulefile b/Modulefile index dbf3f2e..3743680 100644 --- a/Modulefile +++ b/Modulefile @@ -8,11 +8,5 @@ description 'APT Module for Puppet' project_page 'https://github.com/puppetlabs/puppetlabs-apt' ## Add dependencies, if any: -<<<<<<< HEAD dependency 'puppetlabs/stdlib', '>= 3.0.1' -======= -#dependency 'puppetlabs/stdlib', '2.x' -# The dependency should be written as above but librarian-puppet -# does not support the expression as the PMT does. -dependency 'puppetlabs/stdlib', '>= 2.2.1' ->>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5 + -- 2.45.2