clean up repo

This commit is contained in:
Leo 2017-01-30 11:18:47 -05:00
parent e1d1691cb9
commit 1620b147da
32 changed files with 7 additions and 17724 deletions

View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
<!DOCTYPE html>
<html>
<head>
@ -16,20 +15,6 @@
<script src="../test-utils/browserMock.js"></script>
<script src="../mithril.js"></script>
<script src="test-api.js"></script>
=======
<!doctype html>
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.0.3/es5-shim.min.js"></script>-->
<script src="test.js"></script>
<script src="mock.js"></script>
<script src="../mithril.js"></script>
<script src="mithril-tests.js"></script>
<script>
// shim for running the old test suite with grunt-mocha-phantomjs like the new one
if ('callPhantom' in window) {
window.callPhantom({ testRunEnded: 1})
}
</script>
>>>>>>> origin/next
<script>require("../ospec/ospec").run()</script>
</body>

File diff suppressed because it is too large Load diff