Resolved merge conflicts.

jgebal · jgebal · commit 66ff76062f99 · 2019-03-15T17:21:57.000Z
diff --git a/source/expectations/data_values/ut_key_anyvalues.tpb b/source/expectations/data_values/ut_key_anyvalues.tpb
@@ -30,7 +30,7 @@ create or replace type body ut_key_anyvalues as
   end;
   member function put(a_key varchar2, a_value anydata) return ut_key_anyvalues is
   begin
-    return put(ut_key_anyval_pair(a_key, ut_data_value_anydata.get_instance(a_value)));
+    return put(ut_key_anyval_pair(a_key, ut_data_value_anydata(a_value)));
   end;
 
   member function put(a_key varchar2, a_value blob) return ut_key_anyvalues is
diff --git a/source/install.sql b/source/install.sql
@@ -84,6 +84,8 @@ alter session set current_schema = &&ut3_owner;
 @@install_component.sql 'core/types/ut_reporter_base.tps'
 @@install_component.sql 'core/types/ut_reporters.tps'
 
+@@install_component.sql 'expectations/matchers/ut_matcher_options_items.tps'
+@@install_component.sql 'expectations/matchers/ut_matcher_options.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value.tps'
 @@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps'
 @@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps'
@@ -192,8 +194,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
 @@install_component.sql 'expectations/data_values/ut_cursor_column.tps'
 @@install_component.sql 'expectations/data_values/ut_cursor_column_tab.tps'
 @@install_component.sql 'expectations/data_values/ut_cursor_details.tps'
-@@install_component.sql 'expectations/matchers/ut_matcher_options_items.tps'
-@@install_component.sql 'expectations/matchers/ut_matcher_options.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_blob.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_boolean.tps'
