fixed merge conflict in tests/index

This commit is contained in:
Matthew Dillon 2015-11-13 08:33:04 -07:00
commit 8730b6659f
116 changed files with 1793 additions and 1106 deletions

View file

@ -18,13 +18,14 @@
{{content-for 'test-head-footer'}}
</head>
<body>
{{content-for 'body'}}
{{content-for 'test-body'}}
<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/clostridiumdotinfo.js"></script>
<script src="testem.js"></script>
<script src="testem.js" integrity=""></script>
<script src="assets/tests.js"></script>
<script src="assets/test-loader.js"></script>
{{content-for 'body-footer'}}