From 5952611119d839eea1e4b39be1c89fa2e5cae502 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 15 Jul 2010 21:22:24 +0200
Subject: [PATCH] fixed unclomplete merge with riseups master

---
 manifests/init.pp | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 87668fd..0606182 100644
--- 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 {
           '': {