From 00ead3178b650cc98dad896fea2743677077bee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si> Date: Tue, 17 May 2016 13:07:22 +0100 Subject: [PATCH] mailcore2: remove git conflict line, still doesn't build --- pkgs/development/libraries/mailcore2/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index f535b19bd0eb..4259e52510bc 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ --replace buffio.h tidybuffio.h ->>>>>>> master ''; cmakeFlags = [