From 115b86a0ec7095831ab511235d4aee8090a02c51 Mon Sep 17 00:00:00 2001
From: bubnikv <bubnikv@gmail.com>
Date: Fri, 20 Sep 2019 16:52:42 +0200
Subject: [PATCH] One more merge conflict resolved

---
 src/libslic3r/GCodeSender.cpp | 3 +--
 src/libslic3r/GCodeSender.hpp | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/libslic3r/GCodeSender.cpp b/src/libslic3r/GCodeSender.cpp
index 6dd30839b9..0988091ce3 100644
--- a/src/libslic3r/GCodeSender.cpp
+++ b/src/libslic3r/GCodeSender.cpp
@@ -7,7 +7,6 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/asio/serial_port_service.hpp>
 
 #if defined(__APPLE__) || defined(__OpenBSD__)
 #include <termios.h>
@@ -550,7 +549,7 @@ void
 GCodeSender::set_DTR(bool on)
 {
 #if defined(_WIN32) && !defined(__SYMBIAN32__)
-    boost::asio::serial_port::native_handle_type handle = this->serial.native_handle();
+    boost::asio::serial_port_service::native_handle_type handle = this->serial.native_handle();
     if (on)
         EscapeCommFunction(handle, SETDTR);
     else
diff --git a/src/libslic3r/GCodeSender.hpp b/src/libslic3r/GCodeSender.hpp
index 42d8fe3d30..d7663ca554 100644
--- a/src/libslic3r/GCodeSender.hpp
+++ b/src/libslic3r/GCodeSender.hpp
@@ -5,7 +5,6 @@
 #include <queue>
 #include <string>
 #include <vector>
-#include <boost/core/noncopyable.hpp>
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>