From 3bc4aefe873914b4851f5f1383fa8b1cc1cddb94 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 16 Apr 2013 18:43:07 +1000
Subject: [PATCH] fix double include

---
 .jshintrc                                     | 49 ++++++++++++++++++-
 .../common/_discourse_javascript.html.erb     |  1 -
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index d7b4e2f0da1..b9b9f7c81e4 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1 +1,48 @@
-{"paths":["app/assets/javascripts/**/*.js","spec/javascripts/**/*.js","spec/phantom_js/**/*.js"],"exclude_paths":["app/assets/javascripts/external/*","app/assets/javascripts/external_production/*","app/assets/javascripts/external_development/*","app/assets/javascripts/defer/*","app/assets/javascripts/locales/i18n.js"],"adsafe":false,"bitwise":true,"newcap":true,"eqeqeq":true,"immed":false,"nomen":false,"onevar":false,"plusplus":false,"regexp":false,"safe":false,"strict":false,"undef":true,"white":false,"eqnull":false,"cap":false,"css":false,"debug":false,"es5":false,"evil":false,"forin":false,"fragment":false,"laxbreak":false,"true":false,"sub":false,"maxlen":200,"indent":2,"maxerr":50,"passfail":false,"predef":["Ember","jQuery","$","RSVP","Discourse","$LAB","Em","PreloadStore","Handlebars","I18n","bootbox"],"browser":true,"rhino":false,"windows":false,"widget":false,"devel":true,"loopfunc":true,"asi":true,"boss":true,"couch":true,"curly":false,"noarg":true,"node":false,"noempty":false,"nonew":true,"lastsemic":false,"newstat":false,"statinexp":false}
+{
+  "bitwise":true,
+  "newcap":true,
+  "eqeqeq":true,
+  "immed":false,
+  "nomen":false,
+  "onevar":false,
+  "plusplus":false,
+  "regexp":false,
+  "strict":false,
+  /*"undef":true,*/
+  "white":false,
+  "eqnull":false,
+  "debug":false,
+  "es5":false,
+  "evil":false,
+  "forin":false,
+  "laxbreak":false,
+  "sub":false,
+  "maxlen":200,
+  "indent":2,
+  "maxerr":50,
+  "passfail":false,
+  "predef":["Ember",
+    "jQuery",
+    "$",
+    "RSVP",
+    "Discourse",
+    "$LAB",
+    "Em",
+    "PreloadStore",
+    "Handlebars",
+    "I18n",
+    "bootbox"],
+  "browser":true,
+  "rhino":false,
+  "devel":true,
+  "loopfunc":true,
+  "asi":true,
+  "boss":true,
+  "couch":true,
+  "curly":false,
+  "noarg":true,
+  "node":false,
+  "noempty":false,
+  "nonew":true,
+  "lastsemic":false
+}
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 72b8f05d4ca..177a263d0cb 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -17,7 +17,6 @@
 <%# load the selected locale before any other scripts %>
 <%= javascript_include_tag "locales/#{I18n.locale}" %>
 <%= javascript_include_tag "application" %>
-<%= javascript_include_tag "admin"%>
 <%- if admin? %>
   <%= javascript_include_tag "admin"%>
 <%- end %>