Merges partiql-engine fix

johnedquinn · johnedquinn · commit 8eb3eeea01f0 · 2023-12-07T11:26:35.000-08:00
diff --git a/partiql-eval/build.gradle.kts b/partiql-eval/build.gradle.kts
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-=======
-
-
->>>>>>> cc736ac7 (Renames org.partiql.engine to org.partiql.eval)
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,3 @@`
`1`		`-<<<<<<< HEAD`
`2`		`-=======`
`3`		`-`
`4`		`-`
`5`		`->>>>>>> cc736ac7 (Renames org.partiql.engine to org.partiql.eval)`
`6`	`1`	`/*`
`7`	`2`	`* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.`
`8`	`3`	`*`