fix conflicts
authorLee Rhodes <leerho@users.noreply.github.com>
Thu, 4 Mar 2021 21:27:32 +0000 (13:27 -0800)
committerLee Rhodes <leerho@users.noreply.github.com>
Thu, 4 Mar 2021 21:27:32 +0000 (13:27 -0800)
commitdf5860be9ce67c38dd0d4c316150bda44151ae7f
tree93a0a14498bdf56c25a713330b91e394d56bb269
parent96e7aec0352ab56caa7944ea5a431afd8971e4b3
parent016923d010e73dd443548c339227efa1e99b0342
fix conflicts
src/main/java/org/apache/datasketches/pig/tuple/ArrayOfDoublesSketchToQuantilesSketch.java
src/main/java/org/apache/datasketches/pig/tuple/DataToArrayOfDoublesSketchBase.java
src/main/java/org/apache/datasketches/pig/tuple/UnionArrayOfDoublesSketchBase.java
src/test/java/org/apache/datasketches/pig/tuple/ArrayOfDoublesSketchToEstimatesTest.java
src/test/java/org/apache/datasketches/pig/tuple/ArrayOfDoublesSketchesToPValueEstimatesTest.java