diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2014-01-23 22:23:59 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2014-01-23 22:23:59 +0100 |
| commit | ee76cc5df42af385743d81ec0810073b7c9ed465 (patch) | |
| tree | 89387c694298768c2ea4766eff097cdd5006fbdf /sample/cache.expected | |
| parent | 4131a5ff622e7c767dfd042c4c357906a2544c01 (diff) | |
| parent | e93aae88985667189bb5b24ad0d5f54cb5fdba70 (diff) | |
| download | coderay-ee76cc5df42af385743d81ec0810073b7c9ed465.tar.gz | |
Merge branch 'master' into bash-scanner
Conflicts:
lib/coderay/helpers/file_type.rb
Diffstat (limited to 'sample/cache.expected')
| -rw-r--r-- | sample/cache.expected | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sample/cache.expected b/sample/cache.expected deleted file mode 100644 index f815e88..0000000 --- a/sample/cache.expected +++ /dev/null @@ -1,2 +0,0 @@ -test <test> -test <span class="ta"><test></span> |