From ecec87668a302c34a70c3406e2f3a75df8ef1b7b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 9 Apr 2014 19:49:18 +0300
Subject: [PATCH] Working on issues when setting up the site

---
 app/views/master.blade.php | 2 +-
 bower.json                 | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 1b263bdcc8d0..9dc7676cf63a 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -19,7 +19,7 @@
     <meta property="og:description" content="Simple, Intuitive Invoicing."></meta>
     <meta name="keywords" content="Invoice Ninja"></meta>    
     
-    <script src="{{ asset('vendor/jquery/dist/jquery.min.js') }}" type="text/javascript"></script>  
+    <script src="{{ asset('vendor/jquery/jquery.min.js') }}" type="text/javascript"></script>  
 
     <script type="text/javascript">
     window.onerror = function(e) {
diff --git a/bower.json b/bower.json
index cad291b62526..0bb6f03a0329 100644
--- a/bower.json
+++ b/bower.json
@@ -17,8 +17,5 @@
     "typeahead.js": "~0.9.3",
     "accounting": "~0.*",
     "pdfjs": "*"
-  },
-  "resolutions": {
-    "jquery": "~1.11.*"
   }
-}
+}
\ No newline at end of file