resolved merge conflict

This commit is contained in:
Tu Tran 2017-10-21 16:13:27 -04:00
commit 526ec6eddd

View File

@ -42,6 +42,7 @@ To get started, simply fork this repo. Please refer to [CONTRIBUTING.md](CONTRIB
* [Part 5: TCP Retransmission](http://www.saminiir.com/lets-code-tcp-ip-stack-5-tcp-retransmission/) * [Part 5: TCP Retransmission](http://www.saminiir.com/lets-code-tcp-ip-stack-5-tcp-retransmission/)
* [Build a Live Code-reloader Library for C++](http://howistart.org/posts/cpp/1/index.html) * [Build a Live Code-reloader Library for C++](http://howistart.org/posts/cpp/1/index.html)
* [Write a hash table in C](https://github.com/jamesroutley/write-a-hash-table) * [Write a hash table in C](https://github.com/jamesroutley/write-a-hash-table)
* [Let's Build a Simple Database](https://cstack.github.io/db_tutorial/)
## C#: ## C#: