From cd47798d13266b926ed3e252770afcf05e7d349f Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <bashorov@gmail.com>
Date: Fri, 29 May 2015 01:05:12 +0300
Subject: [PATCH] try to fix conflicts

---
 lib/linguist/languages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index f93f7e60..ce58244b 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1638,7 +1638,7 @@ Kit:
 
 Kotlin:
   type: programming
-  color: "#F18E27"
+  color: "#F18E33"
   extensions:
   - .kt
   - .ktm