diff options
| author | Marc Delisle <marc@infomarc.info> | 2014-04-12 15:27:53 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2014-04-12 15:27:53 +0400 |
| commit | d6592b5eb268f2fa64819aea88d6616edce7fa89 (patch) | |
| tree | da68d74d23e3598abea3e9a9c6d2ba103ec2585b /js/rte.js | |
| parent | 8ef8fbfbc8663a8dab6c5ea58530df63d919c555 (diff) | |
| parent | 6e241b841184c0e23c8eeb4a3766e06f858934bc (diff) | |
Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
Diffstat (limited to 'js/rte.js')
| -rw-r--r-- | js/rte.js | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -757,8 +757,6 @@ RTE.ROUTINE = { /** * Attach Ajax event handlers for the Routines, Triggers and Events editor - * - * FIXME: submit on ENTER keypress in dialog */ $(function () { /** |