try to fix conflicts

This commit is contained in:
Zalim Bashorov
2015-05-29 01:05:12 +03:00
committed by Garen Torikian
parent 3b54df2cde
commit cd47798d13

View File

@@ -1638,7 +1638,7 @@ Kit:
Kotlin:
type: programming
color: "#F18E27"
color: "#F18E33"
extensions:
- .kt
- .ktm