Fix the conflict again

samples/tutorials/data/get_depth.cc

@@ -13,12 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_device_info.cc

@@ -11,13 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_disparity.cc

@@ -13,13 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-<<<<<<< HEAD
-
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_from_callbacks.cc

@@ -11,25 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-<<<<<<< HEAD
-#include <opencv2/highgui/highgui.hpp>
-
-=======
->>>>>>> origin/develop
 #include <atomic>
 #include <memory>
 #include <mutex>
 #include <sstream>
 
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include <opencv2/highgui/highgui.hpp>
 
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 #include "util/cv_painter.h"
 

samples/tutorials/data/get_img_params.cc

@@ -11,13 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_imu.cc

@@ -13,13 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 #include "util/cv_painter.h"
 

samples/tutorials/data/get_imu_params.cc

@@ -11,13 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_points.cc

@@ -13,12 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 #include "util/pc_viewer.h"
 

samples/tutorials/data/get_stereo.cc

@@ -13,12 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_stereo_rectified.cc

@@ -13,12 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_with_plugin.cc

@@ -13,12 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-<<<<<<< HEAD
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE