From 9003139119e21da4c35ec99f21ab7571c5626928 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 10 Dec 2012 09:30:55 -0600
Subject: [PATCH] Can't have 2 same primary extensions

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

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 805891c3..aaa3a455 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -67,7 +67,7 @@ ApacheConf:
   type: markup
   aliases:
   - apache
-  primary_extension: .conf
+  primary_extension: .apacheconf
   filenames:
   - .htaccess
   - httpd.conf
@@ -833,7 +833,7 @@ Nemerle:
 Nginx:
   type: markup
   lexer: Nginx configuration file
-  primary_extension: .conf
+  primary_extension: .nginxconf
   filenames:
   - nginx.conf