Skip to content

Commit

Permalink
Clean up old references to polymer-body
Browse files Browse the repository at this point in the history
Add layout.html to karma config
Fixes Polymer#28
  • Loading branch information
dfreedm committed May 15, 2014
1 parent 7a54a26 commit eb0f591
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
15 changes: 10 additions & 5 deletions build/polymer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<!--
Copyright 2013 The Polymer Authors. All rights reserved.
Use of this source code is governed by a BSD-style
license that can be found in the LICENSE file.
Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<script src="build/polymer.js"></script>
<link rel="import" href="src/polymer-body.html">

<link rel="import" href="layout.html">

<script src="polymer.js"></script>
2 changes: 1 addition & 1 deletion conf/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = function(karma) {
{pattern: 'polymer-expressions/tests/*.js', included: false},
{pattern: 'TemplateBinding/tests/*.js', included: false},
{pattern: 'polymer-dev/polymer.html', included: false},
{pattern: 'polymer-dev/src/polymer-body.html', included: false},
{pattern: 'polymer-dev/layout.html', included: false},
{pattern: 'polymer-dev/src/**/*.js', included: false},
{pattern: 'polymer-dev/build/polymer.js', included: false},
{pattern: 'polymer-dev/test/**/*.css', included: false},
Expand Down

0 comments on commit eb0f591

Please sign in to comment.