summaryrefslogtreecommitdiff
path: root/lib/coderay/token_kinds.rb
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-09 07:27:56 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-09 07:27:56 +0200
commit444054629e31bd69ee697586348572998e93bdab (patch)
tree2a1753f85d5c14f72eaf701628e5e50b42cab328 /lib/coderay/token_kinds.rb
parent0e4858322bfc969bde1b02cab3113940654acf31 (diff)
parent737fb3608c92506a573a79f611b94ff5d5da18e6 (diff)
downloadcoderay-444054629e31bd69ee697586348572998e93bdab.tar.gz
Merge branch 'master' into sass-scanner
Conflicts: lib/coderay/scanners/css.rb
Diffstat (limited to 'lib/coderay/token_kinds.rb')
-rwxr-xr-xlib/coderay/token_kinds.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb
index 3b8d07e..8db8530 100755
--- a/lib/coderay/token_kinds.rb
+++ b/lib/coderay/token_kinds.rb
@@ -85,6 +85,4 @@ module CodeRay
TokenKinds[:method] = TokenKinds[:function]
TokenKinds[:escape] = TokenKinds[:delimiter]
TokenKinds[:docstring] = TokenKinds[:comment]
-
- TokenKinds.freeze
end