From 48947d100625875c43cb2d3c7e18873fcdab7946 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Thu, 17 Oct 2024 11:51:54 +0900
Subject: [PATCH] fix: conflicts

---
 common/unit_test/Test_Utils.cpp  | 1 +
 fft/src/KokkosFFT_Host_plans.hpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/unit_test/Test_Utils.cpp b/common/unit_test/Test_Utils.cpp
index 69b1ca4..ec16eec 100644
--- a/common/unit_test/Test_Utils.cpp
+++ b/common/unit_test/Test_Utils.cpp
@@ -563,6 +563,7 @@ TEST(ToArray, lvalue) {
 
 TEST(ToArray, rvalue) {
   ASSERT_EQ(KokkosFFT::Impl::to_array(std::array{1, 2}), (Kokkos::Array{1, 2}));
+}
 
 template <typename ValueType1, typename ValueType2>
 void test_are_pointers_aliasing() {
diff --git a/fft/src/KokkosFFT_Host_plans.hpp b/fft/src/KokkosFFT_Host_plans.hpp
index 3044083..66df39d 100644
--- a/fft/src/KokkosFFT_Host_plans.hpp
+++ b/fft/src/KokkosFFT_Host_plans.hpp
@@ -38,7 +38,7 @@ auto create_plan(const ExecutionSpace& exec_space,
                  std::unique_ptr<PlanType>& plan, const InViewType& in,
                  const OutViewType& out, BufferViewType&, InfoType&,
                  Direction direction, axis_type<fft_rank> axes,
-                 shape_type<fft_rank> s, bool is_in_place) {
+                 shape_type<fft_rank> s, bool is_inplace) {
   static_assert(
       KokkosFFT::Impl::are_operatable_views_v<ExecutionSpace, InViewType,
                                               OutViewType>,