fix some errors after merge

2 files changed, 0 insertions, 21 deletions

diff --git a/libfreerdp-core/mcs.c b/libfreerdp-core/mcs.c
index 9aa0cdf..332418d 100644
--- a/libfreerdp-core/mcs.c
+++ b/libfreerdp-core/mcs.c
@@ -203,18 +203,6 @@ static tbool mcs_read_domain_mcspdu_header_check(STREAM* s, enum DomainMCSPDU* d
  * do not return false on MCSPDU
  */
 
-static tbool mcs_read_domain_mcspdu_header_check(STREAM* s, enum DomainMCSPDU* domainMCSPDU, uint16* length)
-{
-	enum DomainMCSPDU MCSPDU;
-
-	MCSPDU = *domainMCSPDU;
-	if (!mcs_read_domain_mcspdu_header(s, domainMCSPDU, length))
-		return false;
-	if (*domainMCSPDU != MCSPDU)
-		return false;
-	return true;
-}
-
 /* do not return false on MCSPDU */
 tbool mcs_read_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU* domainMCSPDU, uint16* length)
 {
diff --git a/libfreerdp-core/rdp.c b/libfreerdp-core/rdp.c
index 92ca32c..0b0480e 100644
--- a/libfreerdp-core/rdp.c
+++ b/libfreerdp-core/rdp.c
@@ -26,11 +26,8 @@
 #define LLOG_LEVEL 1
 #define LLOGLN(_level, _args) \
   do { if (_level < LLOG_LEVEL) { printf _args ; printf("\n"); } } while (0)
-<<<<<<< HEAD
 #define LHEXDUMP(_level, _args) \
   do { if (_level < LLOG_LEVEL) { freerdp_hexdump _args ; } } while (0)
-=======
->>>>>>> b013ab51c8860e763a9f0a14201679b4c2eff54e
 
 static const char* const DATA_PDU_TYPE_STRINGS[] =
 {
@@ -736,13 +733,7 @@ static tbool rdp_recv_tpkt_pdu(rdpRdp* rdp, STREAM* s)
 		LLOGLN(0, ("Incorrect RDP header."));
 		return false;
 	}
-<<<<<<< HEAD
 	LLOGLN(10, ("rdp_recv_tpkt_pdu: length %d", length));
-=======
-
-	LLOGLN(10, ("rdp_recv_tpkt_pdu length %d", length));
-
->>>>>>> b013ab51c8860e763a9f0a14201679b4c2eff54e
 	if (rdp->disconnect)
 	{
 		LLOGLN(0, ("rdp_recv_tpkt_pdu: disconnect"));