From d0a88b9706dfd922940d9d9f31f310a2162348b5 Mon Sep 17 00:00:00 2001 From: Victor Felder Date: Thu, 9 Oct 2014 10:19:41 -0400 Subject: [PATCH] Fix conflict (#1149) --- free-programming-books.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/free-programming-books.md b/free-programming-books.md index 42573c15a..c29c6847e 100644 --- a/free-programming-books.md +++ b/free-programming-books.md @@ -492,6 +492,7 @@ * [Programming on Parallel Machines; GPU, Multicore, Clusters and More](http://heather.cs.ucdavis.edu/parprocbook) - Norm Matloff * [The OpenCL Programming Book](http://www.fixstars.com/en/opencl/book/OpenCLProgrammingBook/contents/) + #### Partial Evaluation * [Partial Evaluation and Automatic Program Generation](http://www.itu.dk/people/sestoft/pebook/) - (PDF) Jones, Gomard and Sestoft @@ -499,7 +500,6 @@ #### Professional Development * [Apprenticeship Patterns: Guidance for the Aspiring Software Craftsman](http://chimera.labs.oreilly.com/books/1234000001813/index.html) - David H. Hoover and Adewale Oshineye * [Confessions of an IT Manager](http://download.red-gate.com/ebooks/DotNet/Confessions_IT_Manager.zip) *(RedGate, By Phil Factor)* -<<<<<<< HEAD * [Don't Just Roll the Dice](http://download.red-gate.com/ebooks/DJRTD_eBook.pdf) (PDF) *(RedGate, By Neil Davidson)* * [How to be a Programmer: A Short, Comprehensive, and Personal Summary](http://samizdat.mines.edu/howto/HowToBeAProgrammer.html) by Robert L. Read * [How to Do What You Love & Earn What You’re Worth as a Programmer](https://leanpub.com/dowhatyoulove/read) *(Leanpub, By Reginald Braithwaite)* @@ -510,10 +510,6 @@ #### Programming Paradigms * [Introduction to Functional Programming](http://www.cl.cam.ac.uk/teaching/Lectures/funprog-jrh-1996/) (class lectures and slides) * [Type Theory and Functional Programming](https://www.cs.kent.ac.uk/people/staff/sjt/TTFP/) -======= -* [Apprenticeship Patterns](http://chimera.labs.oreilly.com/books/1234000001813/index.html) - David H. Hoover and Adewale Oshineye -* [How to Do What You Love & Earn What You’re Worth as a Programmer](https://leanpub.com/dowhatyoulove/read) - Reginald Braithwaite ->>>>>>> d2b28c30620234fad339a3efcf158da940fbfb30 #### Regular Expressions