fixed unclomplete merge with riseups master

diff --git a/manifests/init.pp b/manifests/init.pp
index 87668fd74107c6aef7758f23e2bb06950c6af575..0606182e491a7c0fcfc2a6411aaaa93521de8090 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -113,25 +113,12 @@ class apt {
          ensure => latest,
        }
 
-<<<<<<< HEAD
-       ## This package should really always be current
-       package { "debian-archive-keyring":
-         ensure => latest,
-       }
-
-=======
->>>>>>> riseup/master
        case $backports_enabled {
          'true': {   
              config_file {
                      # backports
-<<<<<<< HEAD
                      "/etc/apt/sources.list.d/${operatingsystem}-backports.list":
                              content => template("apt/${operatingsystem}/sources.list.backports.erb"),
-=======
-                     "/etc/apt/sources.list.d/debian-backports.list":
-                             content => template("apt/sources.list.backports.erb"),
->>>>>>> riseup/master
                              require => Exec[assert_lsbdistcodename];
              }
                
@@ -180,7 +167,6 @@ class apt {
          default: { }
        }
 
-<<<<<<< HEAD
        case $apt_deb_src_enabled {
          'true': {   
              config_file {
@@ -202,9 +188,6 @@ class apt {
          }             
          default: {}
        }
-=======
-    
->>>>>>> riseup/master
 
         case $custom_key_dir {
           '': {