From 1f491ccd0fa0399c0556fae6409ec2c4bd770f79 Mon Sep 17 00:00:00 2001
From: Lars Glud <larshg@gmail.com>
Date: Mon, 26 Aug 2024 07:55:19 +0200
Subject: [PATCH] Minor fixups due to conflicts.

---
 gpu/octree/src/octree.cpp                | 2 +-
 sample_consensus/src/sac_model_torus.cpp | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/gpu/octree/src/octree.cpp b/gpu/octree/src/octree.cpp
index e5b06391aab..0f8085d40e4 100644
--- a/gpu/octree/src/octree.cpp
+++ b/gpu/octree/src/octree.cpp
@@ -34,8 +34,8 @@
  *  Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com)
  */
 
-#include <pcl/gpu/containers/initialization.h>
 #include <pcl/gpu/octree/octree.hpp>
+#include <pcl/gpu/utils/initialization.h>
 #include <pcl/gpu/utils/timers_cuda.hpp>
 #include <pcl/gpu/utils/safe_call.hpp>
 
diff --git a/sample_consensus/src/sac_model_torus.cpp b/sample_consensus/src/sac_model_torus.cpp
index c5b43269ab7..f0d71b9ee9e 100644
--- a/sample_consensus/src/sac_model_torus.cpp
+++ b/sample_consensus/src/sac_model_torus.cpp
@@ -35,7 +35,6 @@
  *
  */
 
-<<<<<<<< HEAD:sample_consensus/src/sac_model_torus.cpp
 #include <pcl/sample_consensus/impl/sac_model_torus.hpp>
 
 #ifndef PCL_NO_PRECOMPILE
@@ -43,10 +42,3 @@
 #include <pcl/point_types.h>
 PCL_INSTANTIATE_PRODUCT(SampleConsensusModelTorus, ((pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGBA)(pcl::PointXYZRGB))((pcl::Normal)))
 #endif    // PCL_NO_PRECOMPILE
-
-========
-#include <pcl/gpu/containers/impl/internal.hpp>
-#include <pcl/gpu/containers/impl/repacks.hpp>
-
-#include <cassert>
->>>>>>>> bd73969fa (Change to use target_include_directories.):gpu/containers/src/repacks.cpp