diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 16:06:02 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 16:06:02 +0200 |
commit | 0013b649f714f23eef0859921fa7804ca7caef76 (patch) | |
tree | 7c278ee7c420729b4738fe2a195e529ffd2bb6da /sample/load_scanner.expected | |
parent | addcbd446066d0da1627112814e3ce1b8d404da0 (diff) | |
parent | 64ca2ae8ad5130bdcf652aa7aa08298de00f20f4 (diff) | |
download | coderay-0013b649f714f23eef0859921fa7804ca7caef76.tar.gz |
Merge branch 'master' into go-scanner
Conflicts:
lib/coderay/helpers/file_type.rb
Diffstat (limited to 'sample/load_scanner.expected')
-rw-r--r-- | sample/load_scanner.expected | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sample/load_scanner.expected b/sample/load_scanner.expected deleted file mode 100644 index a2d200d..0000000 --- a/sample/load_scanner.expected +++ /dev/null @@ -1,8 +0,0 @@ -CodeRay::Encoders::Ruby is not defined; you must load it first. -Now it is loaded: CodeRay::Scanners::Ruby -See? -Require is also possible: CodeRay::Scanners::C -See? -Now load some mapped scanners: cpp and plain. -Require all Scanners: -[[nil, :plain], [:c, CodeRay::Scanners::C], [:cpp, :c], [:delphi, CodeRay::Scanners::Delphi], [:html, CodeRay::Scanners::HTML], [:irb, :ruby], [:nitro, :nitro_xhtml], [:nitro_xhtml, CodeRay::Scanners::NitroXHTML], [:pascal, :delphi], [:plain, CodeRay::Scanners::Plaintext], [:plaintext, CodeRay::Scanners::Plaintext], [:rhtml, CodeRay::Scanners::RHTML], [:ruby, CodeRay::Scanners::Ruby], [:xhtml, :nitro_xhtml], [:xml, :html]] |