From f1815b93d9f6ef02b7f7c371eef9cc8be66e59d9 Mon Sep 17 00:00:00 2001
From: Jsx <saurabh@rebugged.com>
Date: Mon, 7 Jul 2014 01:00:36 +0530
Subject: [PATCH] ml: resolving merge conflicts.

---
 ml/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 ml/index.html

diff --git a/ml/index.html b/ml/index.html
old mode 100644
new mode 100755
index 8bf5a0f0..4ed7675e
--- a/ml/index.html
+++ b/ml/index.html
@@ -23,7 +23,7 @@
 
                           <!-- Language list for browsers that do not have JS enabled -->
                           <ul id="languages" class="os">
-                            <li><a class="current" href="/en">english</a></li>
+                            <li><a href="/en">english</a></li>
                             <!--<li><a href="/es">español</a></li>-->
                             <li><a href="/fr">français</a></li>
                             <li><a href="/de">deutsch</a></li>
@@ -32,7 +32,7 @@
                             <li><a href="/tr">türkçe</a></li>
                             <!--<li><a href="/ro">română</a></li>-->
                             <li><a href="/ru">русский</a></li>
-                            <!--<li><a href="/ml">മലയാളം</a></li>-->
+                            <li><a class="current" href="/ml">മലയാളം</a></li>
                             <!--<li><a href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <!--<li><a href="/el">ελληνικά</a></li>-->
-- 
2.25.1