From 89ff8a6d7e96b766246db2b92a286ddba128acc9 Mon Sep 17 00:00:00 2001
From: Evan Duffield <evan@dashpay.io>
Date: Thu, 3 Mar 2016 06:55:32 -0700
Subject: [PATCH] merged and fixed messages

---
 build-aux/m4/bitcoin_find_bdb48.m4 |  4 ++--
 src/masternode-sync.cpp            | 17 -----------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/bitcoin_find_bdb48.m4
index 0bf558d25..838fdd1f1 100644
--- a/build-aux/m4/bitcoin_find_bdb48.m4
+++ b/build-aux/m4/bitcoin_find_bdb48.m4
@@ -38,7 +38,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
   done
   if test "x$bdbpath" = "xX"; then
     AC_MSG_RESULT([no])
-    AC_MSG_ERROR([libdb_cxx headers missing, Bitcoin Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
+    AC_MSG_ERROR([libdb_cxx headers missing, Dash Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
   elif test "x$bdb48path" = "xX"; then
     BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
     AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[
@@ -60,7 +60,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
     ])
   done
   if test "x$BDB_LIBS" = "x"; then
-      AC_MSG_ERROR([libdb_cxx missing, Bitcoin Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
+      AC_MSG_ERROR([libdb_cxx missing, Dash Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
   fi
   AC_SUBST(BDB_LIBS)
 ])
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index 93e4631b3..a07a6571a 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -345,19 +345,11 @@ void CMasternodeSync::Process()
 
                 return; //this will cause each peer to get one request each six seconds for the various assets we need
             }
-<<<<<<< HEAD
 
             // MODE : MASTERNODE_SYNC_MNW
             if(RequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
                 //printf("MASTERNODE_SYNC_MNW Timeout at %d\n", lastMasternodeWinner < GetTime() - MASTERNODE_SYNC_TIMEOUT);
 
-=======
-
-            // MODE : MASTERNODE_SYNC_MNW
-            if(RequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
-                //printf("MASTERNODE_SYNC_MNW Timeout at %d\n", lastMasternodeWinner < GetTime() - MASTERNODE_SYNC_TIMEOUT);
-
->>>>>>> e1616160952f25d26a88002dd9448b1ad5d48202
                 // Shall we move onto the next asset?
                 // --
                 // This might take a lot longer than 2 minutes due to new blocks, but that's OK. It will eventually time out if needed
@@ -390,11 +382,7 @@ void CMasternodeSync::Process()
                 if(pindexPrev == NULL) return;
 
                 int nMnCount = mnodeman.CountEnabled();
-<<<<<<< HEAD
-                pnode->PushMessage("mnget", nMnCount); //sync payees
-=======
                 pnode->PushMessage(NetMsgType::MNWINNERSSYNC, nMnCount); //sync payees
->>>>>>> e1616160952f25d26a88002dd9448b1ad5d48202
                 RequestedMasternodeAttempt++;
 
 
@@ -437,13 +425,8 @@ void CMasternodeSync::Process()
                 if(pnode->HasFulfilledRequest("busync")) continue;
                 pnode->FulfilledRequest("busync");
 
-<<<<<<< HEAD
-                uint256 n = 0;
-                pnode->PushMessage("mnvs", n); //sync masternode votes
-=======
                 uint256 n = uint256();
                 pnode->PushMessage(NetMsgType::MNBUDGETVOTESYNC, n); //sync masternode votes
->>>>>>> e1616160952f25d26a88002dd9448b1ad5d48202
                 RequestedMasternodeAttempt++;
 
                 return; //this will cause each peer to get one request each six seconds for the various assets we need