Fix the conflict again

samples/tutorials/intermediate/get_all_device_info.cc

@@ -11,15 +11,9 @@
 // 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/context.h"
-#include "mynteye/device.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/logger.h"
 #include "mynteye/device/context.h"
 #include "mynteye/device/device.h"
->>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/intermediate/get_depth_and_points.cc

@@ -14,13 +14,8 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-<<<<<<< HEAD
-
-#include "mynteye/api.h"
-=======
 // #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
->>>>>>> origin/develop
 
 #include "util/cv_painter.h"
 #include "util/pc_viewer.h"