text: <<<<<<< HEAD
  // Copyright (c) 2012-2016 The Bitcoin Core developers
  // Distributed under the MIT software license, see the accompanying
  // file COPYING or http://www.opensource.org/licenses/mit-license.php.
  
  #ifndef WIFICOIN_VERSION_H
  #define WIFICOIN_VERSION_H
  
  /**
   * network protocol versioning
   */
  
  static const int PROTOCOL_VERSION = 70015;
  
  //! initial proto version, to be increased after version/verack negotiation
  static const int INIT_PROTO_VERSION = 209;
  
  //! In this version, 'getheaders' was introduced.
  static const int GETHEADERS_VERSION = 31800;
  
  //! disconnect from peers older than this proto version
  static const int MIN_PEER_PROTO_VERSION = GETHEADERS_VERSION;
  
  //! nTime field added to CAddress, starting with this version;
  //! if possible, avoid requesting addresses nodes older than this
  static const int CADDR_TIME_VERSION = 31402;
  
  //! BIP 0031, pong message, is enabled for all versions AFTER this one
  static const int BIP0031_VERSION = 60000;
  
  //! "filter*" commands are disabled without NODE_BLOOM after and including this version
  static const int NO_BLOOM_VERSION = 70011;
  
  //! "sendheaders" command and announcing blocks with headers starts with this version
  static const int SENDHEADERS_VERSION = 70012;
  
  //! "feefilter" tells peers to filter invs to you by fee starts with this version
  static const int FEEFILTER_VERSION = 70013;
  
  //! short-id-based block download starts with this version
  static const int SHORT_IDS_BLOCKS_VERSION = 70014;
  
  //! not banning for invalid compact blocks starts with this version
  static const int INVALID_CB_NO_BAN_VERSION = 70015;
  
  #endif // WIFICOIN_VERSION_H
  =======
  // Copyright (c) 2012 The Bitcoin developers
  // Distributed under the MIT/X11 software license, see the accompanying
  // file COPYING or http://www.opensource.org/licenses/mit-license.php.
  #ifndef BITCOIN_VERSION_H
  #define BITCOIN_VERSION_H
  
  #include "clientversion.h"
  #include <string>
  
  //
  // client versioning
  //
  
  static const int CLIENT_VERSION =
                             1000000 * CLIENT_VERSION_MAJOR
                           +   10000 * CLIENT_VERSION_MINOR
                           +     100 * CLIENT_VERSION_REVISION
                           +       1 * CLIENT_VERSION_BUILD;
  
  extern const std::string CLIENT_NAME;
  extern const std::string CLIENT_BUILD;
  extern const std::string CLIENT_DATE;
  
  //
  // network protocol versioning
  //
  
  static const int PROTOCOL_VERSION = 70001;
  
  // earlier versions not supported as of Feb 2012, and are disconnected
  static const int MIN_PROTO_VERSION = 209;
  
  // nTime field added to CAddress, starting with this version;
  // if possible, avoid requesting addresses nodes older than this
  static const int CADDR_TIME_VERSION = 31402;
  
  // only request blocks from nodes outside this range of versions
  static const int NOBLKS_VERSION_START = 32000;
  static const int NOBLKS_VERSION_END = 32400;
  
  // BIP 0031, pong message, is enabled for all versions AFTER this one
  static const int BIP0031_VERSION = 60000;
  
  // "mempool" command, enhanced "getdata" behavior starts with this version:
  static const int MEMPOOL_GD_VERSION = 60002;
  
  #endif
  >>>>>>> 50d0f227934973e5559f2db2f3bb9b69428605a1
  