Merge pull request #286 from apenney/fix-for-post-wheezy

[puppet-modules/puppetlabs-apt.git] / Modulefile

diff --git a/Modulefile b/Modulefile
index dbf3f2e209bc0234a190a27c328569003e94e88b..40a87f4ef3967d56c9ee7c18985ff9524d7384f7 100644 (file)
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-apt'
-version '1.1.0'
+version '1.4.2'
 source  'https://github.com/puppetlabs/puppetlabs-apt'
 author  'Evolving Web / Puppet Labs'
 license 'Apache License 2.0'
@@ -8,11 +8,7 @@ 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