Merge conflicts

airbnb · Mar 29, 2024 · ec04140 · ec04140
1 parent 74696b3
commit ec04140
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/spark/src/main/scala/ai/chronon/spark/ChrononKryoRegistrator.scala b/spark/src/main/scala/ai/chronon/spark/ChrononKryoRegistrator.scala
@@ -107,7 +107,6 @@ class ChrononKryoRegistrator extends KryoRegistrator {
       "org.apache.spark.util.sketch.BloomFilterImpl",
       "org.apache.spark.util.collection.CompactBuffer",
       "scala.reflect.ClassTag$$anon$1",
-      "scala.reflect.ClassTag$GenericClassTag",
       "scala.math.Ordering$$anon$4",
       "org.apache.spark.sql.catalyst.expressions.codegen.LazilyGeneratedOrdering",
       "org.apache.spark.sql.catalyst.expressions.SortOrder",