13 lines
692 B
Diff
13 lines
692 B
Diff
diff --git a/tools/json_schema_compiler/feature_compiler.py b/tools/json_schema_compiler/feature_compiler.py
|
|
index 13125d357f26aad70a6d59a5b527aefc64a4d5cf..beb3af301a0154c741de781ee75cd56d10be34ad 100644
|
|
--- a/tools/json_schema_compiler/feature_compiler.py
|
|
+++ b/tools/json_schema_compiler/feature_compiler.py
|
|
@@ -774,6 +774,7 @@ class FeatureCompiler(object):
|
|
abs_source_file)
|
|
raise
|
|
dupes = set(f_json) & set(self._json)
|
|
+ from tools.json_schema_compiler import feature_compiler_helper; feature_compiler_helper.DiscardBraveOverridesFromDupes(dupes)
|
|
assert not dupes, 'Duplicate keys found: %s' % list(dupes)
|
|
self._json.update(f_json)
|
|
|