diff options
| author | Joshua Peek <josh@joshpeek.com> | 2012-12-10 09:02:24 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2012-12-10 09:02:24 -0600 |
| commit | dcc2be078110d2d2a8919fad693557e9f80233c5 (patch) | |
| tree | 6e22f4379fce01cce66cdebc89b28a12e81b8c0b /samples/PHP | |
| parent | ec3434cf1d0d02a8fbc61a7c8038970c01b94227 (diff) | |
| parent | 161d076bfdc93c5523bdccc18fddde1ba9c5e990 (diff) | |
Merge branch 'master' into dont-explode-on-invalid-shebang
Conflicts:
lib/linguist/samples.json
test/test_tokenizer.rb
Diffstat (limited to 'samples/PHP')
| -rw-r--r-- | samples/PHP/php-script.script! | 4 | ||||
| -rw-r--r-- | samples/PHP/php.script! | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/samples/PHP/php-script.script! b/samples/PHP/php-script.script! new file mode 100644 index 0000000..567b9a8 --- /dev/null +++ b/samples/PHP/php-script.script! @@ -0,0 +1,4 @@ +#!/usr/bin/php +<?php + +echo "PHP\n";
\ No newline at end of file diff --git a/samples/PHP/php.script! b/samples/PHP/php.script! new file mode 100644 index 0000000..241820d --- /dev/null +++ b/samples/PHP/php.script! @@ -0,0 +1,4 @@ +#!/usr/bin/env php +<?php + +echo "PHP\n";
\ No newline at end of file |