From 96dfbc71eb6aa975a03ae35e4d311e2e4b391d21 Mon Sep 17 00:00:00 2001
From: Adolfo Builes <builes.adolfo@gmail.com>
Date: Sat, 25 Jan 2014 14:14:56 -0200
Subject: [PATCH] Add .es6 as JavaScript extension.

---
 lib/linguist/languages.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 3668ba1b..08bb2dff 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -735,7 +735,7 @@ Harbour:
   lexer: Text only
   color: "#0e60e3"
   primary_extension: .hb
- 
+
 Haskell:
   type: programming
   color: "#29b544"
@@ -860,6 +860,7 @@ JavaScript:
   extensions:
   - ._js
   - .bones
+  - .es6
   - .jake
   - .jsfl
   - .jsm
@@ -1196,7 +1197,7 @@ PAWN:
   lexer: C++
   color: "#dbb284"
   primary_extension: .pwn
-  
+
 PHP:
   type: programming
   ace_mode: php
@@ -1319,7 +1320,7 @@ Prolog:
   type: programming
   color: "#74283c"
   primary_extension: .prolog
-  extensions: 
+  extensions:
   - .pl
 
 Protocol Buffer: