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/simple.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/simple.expected')
| -rw-r--r-- | sample/simple.expected | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sample/simple.expected b/sample/simple.expected deleted file mode 100644 index b3d7875..0000000 --- a/sample/simple.expected +++ /dev/null @@ -1 +0,0 @@ -<span class="CodeRay">puts <span style="background-color:#fff0f0;color:#D20"><span style="color:#710">'</span><span style="">Hello, world!</span><span style="color:#710">'</span></span></span> |