OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
[pettanr/pettanr.git]
/
app
/
assets
/
javascripts
/
application.js
diff --git
a/app/assets/javascripts/application.js
b/app/assets/javascripts/application.js
index
26e94c0
..
42a9926
100644
(file)
--- a/
app/assets/javascripts/application.js
+++ b/
app/assets/javascripts/application.js
@@
-3,14
+3,6
@@
// be included in the compiled file accessible from http://example.com/assets/application.js
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
// be included in the compiled file accessible from http://example.com/assets/application.js
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
-//
//= require jquery
//= require jquery_ujs
//= require jquery
//= require jquery_ujs
-//= require jquery.ui.all
-//= require textchange
-//= require pettanr_editor
-//= require writing_formats
-//= require_directory ./helpers
-//= require speech_balloon_templates
-//= require panels
-// require_tree .
+//// require_tree .