Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Institut-Ebre/2DAM2015_16
Browse files Browse the repository at this point in the history
francescfores committed Sep 28, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 22915f6 + e0ed6ef commit 699c971
Showing 3 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Alexlliso/helloworld.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/php
<?php
echo "Hello World\n";
Empty file added DanielDolz/helloworld.php
Empty file.
2 changes: 1 addition & 1 deletion Alexlliso/helloworld → Manelhuguet/helloworld.php
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

echo "Hello World\n";

0 comments on commit 699c971

Please sign in to comment.