undo merge

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);