From 8607ecb745f34f6111dcb89c18aacdb29b791650 Mon Sep 17 00:00:00 2001 From: Richard Newman Date: Tue, 3 Apr 2018 14:54:46 -0700 Subject: [PATCH] Fix merge conflict. --- core/src/values.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/values.rs b/core/src/values.rs index 8502a8cd..e8eb2ba7 100644 --- a/core/src/values.rs +++ b/core/src/values.rs @@ -46,7 +46,7 @@ lazy_static_namespaced_keyword_value!(DB_FULLTEXT, "db", "fulltext"); lazy_static_namespaced_keyword_value!(DB_IDENT, "db", "ident"); lazy_static_namespaced_keyword_value!(DB_INDEX, "db", "index"); lazy_static_namespaced_keyword_value!(DB_INSTALL_ATTRIBUTE, "db.install", "attribute"); -lazy_static_namespaced_keyword_value!(DB_IS_COMPONENT, "db", "component"); +lazy_static_namespaced_keyword_value!(DB_IS_COMPONENT, "db", "isComponent"); lazy_static_namespaced_keyword_value!(DB_NO_HISTORY, "db", "noHistory"); lazy_static_namespaced_keyword_value!(DB_PART_DB, "db.part", "db"); lazy_static_namespaced_keyword_value!(DB_RETRACT, "db", "retract");