diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-16 01:18:34 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-16 01:18:34 +0200 |
| commit | a6ddf469fadefcd61bf6bb079160d538f02ef427 (patch) | |
| tree | f4eabf724edce1f6d512b0f7cebb2747d9bf6a73 /lib/coderay.rb | |
| parent | e423275749744fb2cf768087a07b4c839eaf4734 (diff) | |
| parent | dc9528456008216c265cfb6613cfa459c3c9ffad (diff) | |
| download | coderay-a6ddf469fadefcd61bf6bb079160d538f02ef427.tar.gz | |
Merge branch 'master' into remove-dump
Conflicts:
lib/coderay/tokens.rb
Diffstat (limited to 'lib/coderay.rb')
| -rw-r--r-- | lib/coderay.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/coderay.rb b/lib/coderay.rb index 88c7cc2..24ae5a2 100644 --- a/lib/coderay.rb +++ b/lib/coderay.rb @@ -166,7 +166,6 @@ module CodeRay # # See also demo/demo_simple. def scan code, lang, options = {}, &block - # FIXME: return a proxy for direct-stream encoding TokensProxy.new code, lang, options, block end |