diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:52:44 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:52:44 +0200 |
commit | 5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8 (patch) | |
tree | 9e74edadd344247e805f6bd3588a34fdf0dbfa21 /sample/global_vars.expected | |
parent | 69246fc8ed0344eae4dab35286813a00010a08cb (diff) | |
parent | 2abfc49bdc9a9f4e86c90aa968c302ca76c20812 (diff) | |
download | coderay-5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8.tar.gz |
Merge branch 'master' into lua-scanner
Conflicts:
lib/coderay/styles/alpha.rb
lib/coderay/token_kinds.rb
Diffstat (limited to 'sample/global_vars.expected')
-rw-r--r-- | sample/global_vars.expected | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sample/global_vars.expected b/sample/global_vars.expected deleted file mode 100644 index 0dc13c8..0000000 --- a/sample/global_vars.expected +++ /dev/null @@ -1,3 +0,0 @@ -<--$IE-->.TEXT_FIELD(:NAME, "PANFRAGE OHNE $GV UND MIT #{<--$GV-->}").SET ARTIKEL -ODER -TEXT = <--$BLA-->.TEST(...)
\ No newline at end of file |