Created
May 21, 2013 12:48
-
-
Save kahrl/5619535 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/mods.cpp b/src/mods.cpp | |
index 9097f57..9bcf73a 100644 | |
--- a/src/mods.cpp | |
+++ b/src/mods.cpp | |
@@ -309,7 +309,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods) | |
// BAD CASE: name conflict in different levels. | |
u32 oldindex = existing_mods[mod.name]; | |
const ModSpec &oldmod = m_unsatisfied_mods[oldindex]; | |
- errorstream<<"WARNING: Mod name conflict detected: \"" | |
+ actionstream<<"WARNING: Mod name conflict detected: \"" | |
<<mod.name<<"\""<<std::endl | |
<<"Will not load: "<<oldmod.path<<std::endl | |
<<"Overridden by: "<<mod.path<<std::endl; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment