From 7e453a7491c84057292c590f579915cc3bf335bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Aug 2010 17:59:19 +0000
Subject: [PATCH] * Fix breakage in r22897.

svn path=/nixpkgs/trunk/; revision=22901
---
 pkgs/top-level/all-packages.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3791c5fb460..532c83c20cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5980,23 +5980,14 @@ let
     inherit (kde4) qt4 kdelibs automoc4 phonon;
   };
 
-<<<<<<< HEAD
-  rsync = callPackage ../applications/networking/sync/rsync { 
-||||||| merged common ancestors
-  rsync = import ../applications/networking/sync/rsync {
-    inherit fetchurl stdenv acl perl;
-=======
-  rsibreak = makeOverridable (import ../applications/misc/rsibreak) {
-    inherit fetchurl stdenv cmake;
+  rsibreak = callPackage ../applications/misc/rsibreak {
     inherit (kde4) kdelibs kdebase_workspace;
   };
 
-  rsync = import ../applications/networking/sync/rsync {
-    inherit fetchurl stdenv acl perl;
->>>>>>> Add rsibreak
+  rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !stdenv.isDarwin;
   };
-
+  
   rxvt = callPackage ../applications/misc/rxvt { };
 
   # = urxvt