From f6a6169ca26a0d256690ffa3737544add94d74df Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 17 Dec 2017 00:50:32 +0000 Subject: [PATCH] Don't report object conflicts --- src/openrct2/object/ObjectRepository.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 7b4387d672..b0887ac012 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -433,8 +433,9 @@ private: } else { - Console::Error::WriteLine("Object conflict: '%s'", conflict->Path); - Console::Error::WriteLine(" : '%s'", item.Path); + // Commented out temporarily to stop flooding terminal for json-objects branch + // Console::Error::WriteLine("Object conflict: '%s'", conflict->Path); + // Console::Error::WriteLine(" : '%s'", item.Path); return false; } }