From 1f1b3d35fb6eb73e6492d3afd8a85cde848d174f Mon Sep 17 00:00:00 2001
From: avogar <avogar@clickhouse.com>
Date: Fri, 31 Mar 2023 14:28:40 +0000
Subject: [PATCH] Fix conflicts issues

---
 cpp/src/arrow/adapters/orc/adapter.cc | 5 +----
 cpp/src/arrow/adapters/orc/adapter.h  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/cpp/src/arrow/adapters/orc/adapter.cc b/cpp/src/arrow/adapters/orc/adapter.cc
index 881297b7834e3..fec32eae7e008 100644
--- a/cpp/src/arrow/adapters/orc/adapter.cc
+++ b/cpp/src/arrow/adapters/orc/adapter.cc
@@ -196,7 +196,6 @@ class ORCFileReader::Impl {
     return reader_.get();
   }
 
-
   Status Init() {
     int64_t nstripes = reader_->getNumberOfStripes();
     stripes_.resize(nstripes);
@@ -518,9 +517,7 @@ class ORCFileReader::Impl {
 
   Result<std::shared_ptr<RecordBatchReader>> NextStripeReader(int64_t batch_size) {
     std::vector<int> empty_vec;
-    return NextStripeReader(batch_size, empty_vec); 
-  }
-
+    return NextStripeReader(batch_size, empty_vec);
   }
 
  private:
diff --git a/cpp/src/arrow/adapters/orc/adapter.h b/cpp/src/arrow/adapters/orc/adapter.h
index d6a5e3d2c9fa1..299c1e154cc7e 100644
--- a/cpp/src/arrow/adapters/orc/adapter.h
+++ b/cpp/src/arrow/adapters/orc/adapter.h
@@ -30,7 +30,7 @@
 #include "arrow/type_fwd.h"
 #include "arrow/util/macros.h"
 #include "arrow/util/visibility.h"
-#include "arrow/adapters/orc/adapter_util.h"
+#include "arrow/adapters/orc/util.h"
 
 namespace arrow {
 namespace adapters {