fix merge failure (2)

This commit is contained in:
Robin Gloster 2016-06-13 11:06:15 +00:00
parent 851446e26e
commit 56b56c2138

View File

@ -935,10 +935,6 @@ in
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter;
};
bibtextools = callPackage ../tools/typesetting/bibtex-tools {
inherit (strategoPackages016) strategoxt sdf;
};
blueman = callPackage ../tools/bluetooth/blueman {
inherit (gnome3) dconf gsettings_desktop_schemas;
withPulseAudio = config.pulseaudio or true;