jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Fabian Jakobs 2011-08-04 12:39:34 +02:00
commit 133abb1d2d
2 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
demo/demo.js
View file

@ -677,7 +677,6 @@ define(function(require, exports, module) {
session.addFold(placeHolder, range); session.addFold(placeHolder, range);
} }
} }
};
var themes = {}; var themes = {};
function loadTheme(name, callback) { function loadTheme(name, callback) {

2
kitchen-sink.html
View file

@ -228,7 +228,7 @@
<!--PACKAGE <!--PACKAGE
<script src="demo/kitchen-sink-uncompressed.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script> <script src="demo/kitchen-sink-uncompressed.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
require("demo/boot"); require("demo/demo");
</script> </script>
PACKAGE--> PACKAGE-->