Skip to content

Commit

Permalink
upgrading version of CodeMirror to 4.1.1, and fixing any merge-rot as…
Browse files Browse the repository at this point in the history
… a result.
  • Loading branch information
blerner committed May 16, 2014
1 parent d244e04 commit 9d5dd0a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/CodeMirror
Submodule CodeMirror updated 361 files
8 changes: 4 additions & 4 deletions src/web/repl.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
}
</script>
<script type="text/javascript" src="https://apis.google.com/js/client.js?onload=handleGoogLoad"></script>
<script src="/js/codemirror.js"></script>
<script src="/js/matchbrackets.js"></script>
<script src="/js/draw.js"></script>
<script src="/js/pyret-mode.js"></script>
<script src="/js/require.js"></script>
<script>
requirejs.config({
Expand All @@ -71,10 +75,6 @@
});
</script>
<script src="/js/pyret.js"></script>
<script src="/js/codemirror.js"></script>
<script src="/js/matchbrackets.js"></script>
<script src="/js/draw.js"></script>
<script src="/js/pyret-mode.js"></script>
<!-- <script type="text/javascript"
src="https://caja.appspot.com/caja.js"></script> -->
<script>
Expand Down

0 comments on commit 9d5dd0a

Please sign in to comment.