Skip to content

Commit

Permalink
Merge branch 'hotfix/config-page'
Browse files Browse the repository at this point in the history
  • Loading branch information
TheScown committed Feb 11, 2015
2 parents cf5cb8a + afc5067 commit c16b560
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "hp-find",
"version": "1.0.0",
"private": true,
"authors": [
"Alex Scown <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>com.hp.autonomy.frontend.find</groupId>
<artifactId>find</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<packaging>war</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jsps/config.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit c16b560

Please sign in to comment.