diff options
author | Domen Kožar <domen@dev.si> | 2016-05-17 13:07:22 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2016-05-17 13:07:22 +0100 |
commit | 00ead3178b650cc98dad896fea2743677077bee2 (patch) | |
tree | bb25ca8c2da14f05fe44ae4b84c2ac175b819843 /pkgs | |
parent | b49bf121b8bfea77b1c5c1eff23a96bef46a1eb8 (diff) |
mailcore2: remove git conflict line, still doesn't build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/mailcore2/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index f535b19bd0eba..4259e52510bc9 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 = [ |