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/stream2.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/stream2.expected')
| -rw-r--r-- | sample/stream2.expected | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sample/stream2.expected b/sample/stream2.expected deleted file mode 100644 index 83aee98..0000000 --- a/sample/stream2.expected +++ /dev/null @@ -1,2 +0,0 @@ -kind: regexp, text size: 5. -kind: space, text size: 1. |