MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge error

develop
Myk Taylor 2023-06-11 22:59:54 -07:00
parent aa1c0f2071
commit eaf97c620a
No known key found for this signature in database
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/stockpiles/StockpileSerializer.cpp
Unescape Escape View File

@ -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<string>& filters) {
auto & pbarsblocks = mSettings->bars_blocks;
read_category<StockpileSettings_BarsBlocksSet>(out, "bars_blocks", mode,
>>>>>>> 7a1aacdca (import and export logistics features)
std::bind(&StockpileSettings::has_barsblocks, mBuffer),
std::bind(&StockpileSettings::barsblocks, mBuffer),
mSettings->flags.whole,