From 1e714f1e8c1ba06a3cd7572c1bc855043878dabc Mon Sep 17 00:00:00 2001
From: afederici <ajf5@illinois.edu>
Date: Tue, 1 Dec 2020 02:10:25 -0600
Subject: [PATCH] undo merge

---
 inc/TcpSocket.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/TcpSocket.h b/inc/TcpSocket.h
index 1f80e0a..11e0eb2 100644
--- a/inc/TcpSocket.h
+++ b/inc/TcpSocket.h
@@ -56,7 +56,7 @@ public:
 	void bindServer(string port);
 	void sendFile(int socket, FILE * fp, int size);
 	void mergeFiles(string ip, string port, string handler, string filedest, string header, string toSend, string starts); //merge everything in message
-	void sendLines(int socket, string filename, int start, int end);
+	void sendLines(int socket, string filename, vector<string> starts);
 	int sendMessage(string ip, string port, string message);
 	int messageHandler(int sockfd, string payloadMessage, string returnID);
 	int createConnection(string ip, string port);
-- 
GitLab