From 745df7001fbb239aca79eb02f2b5d593b1f360fc Mon Sep 17 00:00:00 2001
From: fwiffo <borgified@gmail.com>
Date: Thu, 3 Sep 2015 22:05:22 -0700
Subject: [PATCH] got rid of leftover junk from fixing conflict

---
 free-programming-books-tr.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/free-programming-books-tr.md b/free-programming-books-tr.md
index ae2e4dc39..2840b0ebd 100644
--- a/free-programming-books-tr.md
+++ b/free-programming-books-tr.md
@@ -19,10 +19,8 @@
 * [R](#r)
 * [Ruby](#ruby)
 * [Rust](#rust)
-<<<<<<< HEAD
 * [Swift](#swift)
 * [Windows Phone](#windowsphone)
-=======
 
 
 ### Android