From 3203f490fcf8999f07ba6812ec682ab301768f52 Mon Sep 17 00:00:00 2001
From: Blake Grotewold <blake.grotewold@gmail.com>
Date: Fri, 3 Oct 2014 09:38:20 -0400
Subject: [PATCH] Add Turkish to README

This adds a link to Turkish translation on README and fixes an issue
with lang.js where a merge conflict was squashed into a rebase.
---
 README.md     | 11 ++++++-----
 lang/langs.js |  4 ----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 5f5a2e6..3742caf 100644
--- a/README.md
+++ b/README.md
@@ -3,17 +3,18 @@ A Dark Room
 
 A Minimalist Text Adventure Game
 
-[Click to play](http://adarkroom.doublespeakgames.com/)  
-[ 
+[Click to play](http://adarkroom.doublespeakgames.com/)
+[
   [Chinese](http://adarkroom.doublespeakgames.com/?lang=cn) |
-  [French](http://adarkroom.doublespeakgames.com/?lang=fr) | 
+  [French](http://adarkroom.doublespeakgames.com/?lang=fr) |
   [Russian](http://adarkroom.doublespeakgames.com/?lang=ru) |
   [Spanish](http://adarkroom.doublespeakgames.com/?lang=es) |
   [Swedish](http://adarkroom.doublespeakgames.com/?lang=sv) |
   [Ukrainian](http://adarkroom.doublespeakgames.com/?lang=uk) |
-  [Polish](http://adarkroom.doublespeakgames.com/?lang=pl) 
+  [Polish](http://adarkroom.doublespeakgames.com/?lang=pl) |
+  [Turkish](http://adarkroom.doublespeakgames.com/?lang=tr)
 ]
-  
+
 
 [Play on GitHub](http://continuities.github.io/adarkroom)
 
diff --git a/lang/langs.js b/lang/langs.js
index ed7b006..e62bb88 100644
--- a/lang/langs.js
+++ b/lang/langs.js
@@ -6,11 +6,7 @@ var langs = {
 	'uk':'українська',
 	//'jp':'日本語',
 	'ru':'русский',
-<<<<<<< HEAD
 	'sv':'svenska',
 	'pl':'polski',
-	'tr':'Türkçe'
-=======
 	'tr':'türkçe'
->>>>>>> lowercase correction for lang string.
 };