mailcore2: remove git conflict line, still doesn't build

This commit is contained in:
Domen Kožar 2016-05-17 13:07:22 +01:00
parent b49bf121b8
commit 00ead3178b

View File

@ -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 = [