Fix merge conflict in README

diff --cc README
Simple merge

diff --cc manifests/init.pp
index 062be4c11587050a7de3b9a85fd28c911ebd51d8,5aaa13a744fa2a3eee855ff1bf57a98850eb47b1..fc93eb39fa5f4cc432c5e5daa0dfbd5537c15046
--- 1/manifests/init.pp
--- 2/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 a1c73923f585622c1ba6cefda5eb08be1b1fa658,da531db36ecb620a624e3078fddfaaa4087df3ac..9c85b6fd7e903c9058617644fd52d5daa3dbde7a
--- 1/manifests/params.pp
--- 2/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/'

diff --cc templates/Debian/sources.list.erb
Simple merge

diff --cc templates/Ubuntu/sources.list.erb
Simple merge