From 9575f70f38880e70f8e0f694f7022a5276154ec0 Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Tue, 1 Nov 2016 10:02:10 -0400
Subject: [PATCH] fix conflicts

---
 Config.cpp           | 6 ------
 SSUData.cpp          | 5 -----
 Transports.cpp       | 6 ------
 build/CMakeLists.txt | 7 -------
 4 files changed, 24 deletions(-)

diff --git a/Config.cpp b/Config.cpp
index 99f4b0bb..e72749bc 100644
--- a/Config.cpp
+++ b/Config.cpp
@@ -176,21 +176,15 @@ namespace config {
   	trust.add_options()
       ("trust.enabled", value<bool>()->default_value(false), "Enable explicit trust options")
       ("trust.family", value<std::string>()->default_value(""), "Router Familiy to trust for first hops")
-<<<<<<< HEAD
 			("trust.routers", value<std::string>()->default_value(""), "Only Connect to these routers")
       ("trust.hidden", value<bool>()->default_value(false), "Should we hide our router from other routers?");
 
-=======
-      ("trust.routerInfo", value<std::string>()->default_value(""), "Path to routerInfo of floodfill to use with floodfill friend mode")
-      ("trust.hidden", value<bool>()->default_value(true), "should we hide our router from other routers?");
-
     options_description websocket("Websocket Options");
     websocket.add_options()
       ("websockets.enabled", value<bool>()->default_value(false), "enable websocket server")
       ("websockets.address", value<std::string>()->default_value("127.0.0.1"), "address to bind websocket server on")
       ("websockets.port", value<uint16_t>()->default_value(7666), "port to bind websocket server on");
     
->>>>>>> bda4170... add web socket ui
     m_OptionsDesc
       .add(general)
 	  .add(limits)	
diff --git a/SSUData.cpp b/SSUData.cpp
index a1e18c0b..3bff01c3 100644
--- a/SSUData.cpp
+++ b/SSUData.cpp
@@ -234,14 +234,9 @@ namespace transport
 					if (!m_ReceivedMessages.count (msgID))
 					{	
 						m_ReceivedMessages.insert (msgID);
-<<<<<<< HEAD
-						m_LastMessageReceivedTime = i2p::util::GetSecondsSinceEpoch ();
-						if (!msg->IsExpired ())
-=======
 						m_LastMessageReceivedTime = i2p::util::GetSinceEpoch<Time> ();
 						if (!msg->IsExpired ()) {
               EmitEvent({{"type", "transport.recvmsg"} , {"ident", m_Session.GetIdentHashBase64()}, {"number", "1"}});
->>>>>>> bda4170... add web socket ui
 							m_Handler.PutNextMessage (msg);
             }
 						else
diff --git a/Transports.cpp b/Transports.cpp
index d3dedfff..9efd8bb3 100644
--- a/Transports.cpp
+++ b/Transports.cpp
@@ -4,11 +4,8 @@
 #include "I2NPProtocol.h"
 #include "NetDb.h"
 #include "Transports.h"
-<<<<<<< HEAD
 #include "Config.h"
-=======
 #include "Event.h"
->>>>>>> bda4170... add web socket ui
 
 using namespace i2p::data;
 
@@ -596,16 +593,13 @@ namespace transport
 			}
 			else // incoming connection
 			{
-<<<<<<< HEAD
 				if(RoutesRestricted() && ! IsRestrictedPeer(ident)) {
 					// not trusted
 					LogPrint(eLogWarning, "Transports: closing untrusted inbound connection from ", ident.ToBase64());
 					session->Done();
 					return;
 				}
-=======
         EmitEvent({{"type" , "transport.connected"}, {"ident", ident.ToBase64()}, {"inbound", "true"}});
->>>>>>> bda4170... add web socket ui
 				session->SendI2NPMessages ({ CreateDatabaseStoreMsg () }); // send DatabaseStore
 				std::unique_lock<std::mutex>	l(m_PeersMutex);	
 				m_Peers.insert (std::make_pair (ident, Peer{ 0, nullptr, { session }, i2p::util::GetSecondsSinceEpoch (), {} }));
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index e479277f..80c84eef 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -18,13 +18,9 @@ option(WITH_GUI "Include GUI (currently MS Windows only)" ON)
 option(WITH_MESHNET "Build for cjdns test network" OFF)
 option(WITH_ADDRSANITIZER "Build with address sanitizer unix only" OFF)
 option(WITH_THREADSANITIZER "Build with thread sanitizer unix only" OFF)
-<<<<<<< HEAD
 option(WITH_I2LUA "Build for i2lua" OFF)
-=======
 option(WITH_WEBSOCKETS "Build with websocket ui" OFF)
 
->>>>>>> bda4170... add web socket ui
-
 # paths
 set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
 set ( CMAKE_SOURCE_DIR ".." )
@@ -382,11 +378,8 @@ message(STATUS "  PCH              : ${WITH_PCH}")
 message(STATUS "  MESHNET          : ${WITH_MESHNET}")
 message(STATUS "  ADDRSANITIZER    : ${WITH_ADDRSANITIZER}")
 message(STATUS "  THEADSANITIZER   : ${WITH_THREADSANITIZER}")
-<<<<<<< HEAD
 message(STATUS "  I2LUA            : ${WITH_I2LUA}")
-=======
 message(STATUS "  WEBSOCKETS       : ${WITH_WEBSOCKETS}")
->>>>>>> bda4170... add web socket ui
 message(STATUS "---------------------------------------")
 
 #Handle paths nicely