From 0281a7deb877757e9902292fc7730463d156afc8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Jul 2009 08:58:30 +0000
Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=16131

---
 pkgs/lib/trivial.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix
index a4fbd164fe5..4b99ad8c72c 100644
--- a/pkgs/lib/trivial.nix
+++ b/pkgs/lib/trivial.nix
@@ -10,7 +10,7 @@ rec {
   concat = x: y: x ++ y;
   or = x: y: x || y;
   and = x: y: x && y;
-  mergeAttrs = x : y : x // y;
+  mergeAttrs = x: y: x // y;
   
   # Take a function and evaluate it with its own returned value.
   fix = f: let result = f result; in result;