From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 9 Oct 2015 16:08:26 +0000 (-0400)
Subject: Fix merge conflict in README
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e4d777e5ec333c819a6b87b5c0186f67e86361ee;p=puppet-apt.git

Fix merge conflict in README
---

e4d777e5ec333c819a6b87b5c0186f67e86361ee
diff --cc manifests/init.pp
index 062be4c,5aaa13a..fc93eb3
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -4,10 -4,8 +4,9 @@@
  # See LICENSE for the full license granted to you.
  
  class apt(
-   $codename = $apt::params::codename,
    $use_lts = $apt::params::use_lts,
    $use_volatile = $apt::params::use_volatile,
 +  $use_backports = $apt::params::use_backports,
    $include_src = $apt::params::include_src,
    $use_next_release = $apt::params::use_next_release,
    $debian_url = $apt::params::debian_url,
diff --cc manifests/params.pp
index a1c7392,da531db..9c85b6f
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@@ -1,8 -1,6 +1,7 @@@
  class apt::params () {
-   $codename = $::lsbdistcodename
    $use_lts = false
    $use_volatile = false
 +  $use_backports = true
    $include_src = false
    $use_next_release = false
    $debian_url = 'http://httpredir.debian.org/debian/'