From 2da3e237306177048e8cf79fb0208c6acdf10fbc Mon Sep 17 00:00:00 2001 From: Nick Tobey Date: Wed, 3 Jan 2024 10:32:50 -0800 Subject: [PATCH] Fix typo in schema merge tests. --- go/libraries/doltcore/merge/schema_merge_test.go | 2 +- go/store/prolly/tree/json_diff_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go/libraries/doltcore/merge/schema_merge_test.go b/go/libraries/doltcore/merge/schema_merge_test.go index 11d492df12..6b3be2312f 100644 --- a/go/libraries/doltcore/merge/schema_merge_test.go +++ b/go/libraries/doltcore/merge/schema_merge_test.go @@ -103,7 +103,7 @@ func TestSchemaMerge(t *testing.T) { testSchemaMerge(t, simpleConflictTests) }) t.Run("json merge tests", func(t *testing.T) { - testSchemaMerge(t, geTests) + testSchemaMerge(t, jsonMergeTests) }) } diff --git a/go/store/prolly/tree/json_diff_test.go b/go/store/prolly/tree/json_diff_test.go index a759b36471..4fa4528825 100644 --- a/go/store/prolly/tree/json_diff_test.go +++ b/go/store/prolly/tree/json_diff_test.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS,