summaryrefslogtreecommitdiff
path: root/test/samples/stream2.expected
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-22 23:52:44 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-22 23:52:44 +0200
commit5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8 (patch)
tree9e74edadd344247e805f6bd3588a34fdf0dbfa21 /test/samples/stream2.expected
parent69246fc8ed0344eae4dab35286813a00010a08cb (diff)
parent2abfc49bdc9a9f4e86c90aa968c302ca76c20812 (diff)
downloadcoderay-5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8.tar.gz
Merge branch 'master' into lua-scanner
Conflicts: lib/coderay/styles/alpha.rb lib/coderay/token_kinds.rb
Diffstat (limited to 'test/samples/stream2.expected')
-rw-r--r--test/samples/stream2.expected2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/samples/stream2.expected b/test/samples/stream2.expected
new file mode 100644
index 0000000..83aee98
--- /dev/null
+++ b/test/samples/stream2.expected
@@ -0,0 +1,2 @@
+kind: regexp, text size: 5.
+kind: space, text size: 1.