fix conflicts

diff --git a/.travis.yml b/.travis.yml
index c825f5e4ed3da0d6556bfb48fc993923eab5b7d8..a19074d0b8412434d76d5d32f489c4210f9615e2 100644 (file)
--- 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 dbf3f2e209bc0234a190a27c328569003e94e88b..374368073e85786dca836b84ddbeaee544ee4e2a 100644 (file)
--- 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
+