fixed merge conflict after merge with develop

6fcaeada · Astha Rai · fc7a1825 · d02a92cc · 6fcaeada · 6fcaeada
Commit 6fcaeada authored Oct 15, 2024 by Astha Rai
Expand all Show whitespace changes
Inline Side-by-side

Showing with 879 additions and 0 deletions

test/data_type/CMakeLists.txt test/data_type/CMakeLists.txt +5 -0

test/data_type/test_custom_type.cpp test/data_type/test_custom_type.cpp +874 -0

No files found.
--- a/test/data_type/CMakeLists.txt
+++ b/test/data_type/CMakeLists.txt
--- a/test/data_type/test_custom_type.cpp
+++ b/test/data_type/test_custom_type.cpp