Skip to content

Commit 2e60258

Browse files
committed
debugging merge from main
1 parent 8e74c5c commit 2e60258

File tree

14 files changed

+4
-1919
lines changed

14 files changed

+4
-1919
lines changed

deep_conversions/test/test_ros_conversions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <catch2/catch.hpp>
1818

19-
#include "deep_tensor/ros_conversions.hpp"
19+
#include "deep_conversions/ros_conversions.hpp"
2020

2121
TEST_CASE("Image encoding info parsing", "[ros_conversions]")
2222
{

deep_core/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# Copyright (c) 2025-present Polymath Robotics, Inc. All rights reserved
15-
# Proprietary. Any unauthorized copying, distribution, or modification of this software is strictly prohibited.
14+
1615
cmake_minimum_required(VERSION 3.22)
1716
project(deep_core)
1817

deep_core/COLCON_IGNORE

Whitespace-only changes.

deep_core/test/test_tensor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <catch2/catch.hpp>
2020

21-
#include "deep_tensor/tensor.hpp"
21+
#include "deep_core/types/tensor.hpp"
2222

2323
TEST_CASE("deep_ros::Tensor default constructor", "[tensor]")
2424
{

deep_tensor/CMakeLists.txt

Lines changed: 0 additions & 86 deletions
This file was deleted.

deep_tensor/README.md

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)