Merge branch 'patch-1' of git://github.com/alfonso-cabrera/free-programming-books into alfonso-cabrera-patch-1

Conflicts: free-programming-books-tr.md
10 years ago · da6f436189
parent f9105c410c f4464aa156
commit da6f436189
1 changed files with 2 additions and 0 deletions
--- a/free-programming-books-tr.md
+++ b/free-programming-books-tr.md
@ -19,8 +19,10 @@
 * [R](#r)
 * [Ruby](#ruby)
 * [Rust](#rust)
+<<<<<<< HEAD
 * [Swift](#swift)
 * [Windows Phone](#windowsphone)
+=======


 ### Android