From f475795b920a45d76a44081b109c1cfce60f6112 Mon Sep 17 00:00:00 2001 From: Guillaume Munch Date: Sun, 20 Dec 2015 13:08:49 +0000 Subject: [PATCH] Revert "Work around bug #9841" This reverts commit dc016de34eab3fe24d9673a48cabf754bebbadaa. See discussion at http://mid.gmane.org/n53ar8$1tj$1@ger.gmane.org --- src/BufferParams.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 8024d4a5b1..618aed3d3a 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1274,14 +1274,9 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const } os << "\\tracking_changes " << convert(track_changes) << '\n' + << "\\output_changes " << convert(output_changes) << '\n' << "\\html_math_output " << html_math_output << '\n' << "\\html_css_as_file " << html_css_as_file << '\n' - // \output_changes is output at a distance from \tracking changes as a - // workaround to bug #9841: both parameters can be seen as per-user - // preferences and therefore can cause undesirable merge conflicts, in a - // multi-author setting, if it were treated as a single block by the - // version control system. - << "\\output_changes " << convert(output_changes) << '\n' << "\\html_be_strict " << convert(html_be_strict) << '\n'; if (html_math_img_scale != 1.0) -- 2.39.2