From a4ffb44e2f82ad3d61b08d5352dc4e97d24d7dd6 Mon Sep 17 00:00:00 2001
From: Marco Tullney <marco.tullney@posteo.de>
Date: Thu, 28 Jan 2016 20:57:52 +0100
Subject: [PATCH] add tr_TR locale to registry

Conflicts:
	registry/locales.xml
---
 registry/locales.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/registry/locales.xml b/registry/locales.xml
index e8db7372..d0b65ff0 100644
--- a/registry/locales.xml
+++ b/registry/locales.xml
@@ -15,5 +15,7 @@
 <!DOCTYPE locales SYSTEM "../lib/pkp/dtd/locales.dtd">
 
 <locales>
+<<<<<<< HEAD
 	<locale key="en_US" name="English" iso639-2b="eng" />
+	<locale key="tr_TR" name="Türkçe" iso639-2b="tur"/>
 </locales>