From eaf97c620a43ad6e3e14090f8bdf3aeb251785a8 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 11 Jun 2023 22:59:54 -0700 Subject: [PATCH] fix merge error --- plugins/stockpiles/StockpileSerializer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp index f6091b9cd..0cfc7284c 100644 --- a/plugins/stockpiles/StockpileSerializer.cpp +++ b/plugins/stockpiles/StockpileSerializer.cpp @@ -1264,7 +1264,6 @@ bool StockpileSettingsSerializer::write_bars_blocks(color_ostream& out, Stockpil void StockpileSettingsSerializer::read_bars_blocks(color_ostream& out, DeserializeMode mode, const vector& filters) { auto & pbarsblocks = mSettings->bars_blocks; read_category(out, "bars_blocks", mode, ->>>>>>> 7a1aacdca (import and export logistics features) std::bind(&StockpileSettings::has_barsblocks, mBuffer), std::bind(&StockpileSettings::barsblocks, mBuffer), mSettings->flags.whole,