X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=Modulefile;h=45169b31e8305b2016a7e0e662f3209d3298730d;hb=b764779fa4b1616fb480c3e91df2737ac5b1faab;hp=dbf3f2e209bc0234a190a27c328569003e94e88b;hpb=6283f6cf7214c17efe628858e98d28e5526c79fd;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/Modulefile b/Modulefile
index dbf3f2e..45169b3 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-apt'
-version '1.1.0'
+version '1.5.0'
 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