merge fix

list.txt

@@ -0,0 +1,17 @@
+/* threading stuff */
+LIST *receivelist, *sendlist;
+pthread_t input_thread, send_thread, receive_thread, output_thread;
+pthread_mutex_t sendmut, receivemut, sendcvmut, receivecvmut, rendermut;
+pthread_cond_t sendcv, receivecv;
+char closed[] = "Connection closed.";
+
+/* networking stuff */
+int confd, sockfd;
+char s[INET6_ADDRSTRLEN];
+
+/* notcurses stuff */
+struct notcurses *nc;
+struct ncplane *chatlog, *prompt, *stdn;
+unsigned int rows, cols;
+
+

list_removers.c

@@ -31,7 +31,6 @@ int ListRemove(LIST *list) {
     list->current = list->current->next;
   }
   
-  unused->data = NULL;
   free(unused->data);
   free(unused);
   list->size--;

main.c

@@ -481,6 +481,7 @@ int main(int argc, char* argv[]) {
   close(confd);
   ListFree(receivelist);
   ListFree(sendlist);
+  ListFree(history);
   notcurses_stop(nc);
   printf("%s\n", closed);
   return 0;