diff options
| author | toshi <toshi@03aab468-d3d2-4883-8b12-f661bbf03fa8> | 2012-04-30 10:48:43 +0000 |
|---|---|---|
| committer | toshi <toshi@03aab468-d3d2-4883-8b12-f661bbf03fa8> | 2012-04-30 10:48:43 +0000 |
| commit | 7f7940eadb448f8f4a296cbed6f58ce72b7ed360 (patch) | |
| tree | 594067bb4b6a260789d81595a63518fc6980b526 /core/plugin.rb | |
| parent | 2a881c4c5aa3177c0b446efde5bd2c5c794ff5ef (diff) | |
| download | mikutter-7f7940eadb448f8f4a296cbed6f58ce72b7ed360.tar.gz | |
マージミス
git-svn-id: svn://toshia.dip.jp/mikutter/trunk@765 03aab468-d3d2-4883-8b12-f661bbf03fa8
Diffstat (limited to 'core/plugin.rb')
| -rw-r--r-- | core/plugin.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/plugin.rb b/core/plugin.rb index 3cd6cc7d..6b0ed13b 100644 --- a/core/plugin.rb +++ b/core/plugin.rb @@ -461,15 +461,9 @@ class Plugin def method_missing(method, *args, &proc) case method.to_s when /^on_?(.+)$/ -<<<<<<< HEAD - add_event($1, &proc) - when /^filter_?(.+)$/ - add_event_filter($1, &proc) -======= add_event($1, &proc) when /^filter_?(.+)$/ add_event_filter($1, &proc) ->>>>>>> remotes/0.1 when /^hook_?(.+)$/ add_event_hook($1, &proc) else |