Merge branch 'hotfix/config-page' into develop

Conflicts: pom.xml
opentext-idol · Feb 11, 2015 · dc68bb5 · dc68bb5
2 parents e70166c + afc5067
commit dc68bb5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,5 @@
 {
   "name": "hp-find",
-  "version": "1.0.0",
   "private": true,
   "authors": [
     "Alex Scown <[email protected]>",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hp-autonomy-find",
   "repository": "https://github.com/hpautonomy/find",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "devDependencies": {
     "bless": "^3.0.3",
     "bower": "^1.3.12",

diff --git a/src/main/webapp/WEB-INF/jsps/config.jsp b/src/main/webapp/WEB-INF/jsps/config.jsp
@@ -20,7 +20,7 @@
         <![endif]-->
         <link rel="stylesheet" type="text/css" href="../static-${applicationVersion}/css/app.css"/>
 
-        <script type="text/javascript" src="../static-${applicationVersion}/lib/require/require.js" data-main="../static-${applicationVersion}/js/config.js"></script>
+        <script type="text/javascript" src="../static-${applicationVersion}/lib/requirejs/require.js" data-main="../static-${applicationVersion}/js/config.js"></script>
     </head>
     <body>
         <div class="page"></div>