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/global_vars.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/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 |