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
  • Loading branch information
DanielDolz committed Sep 28, 2015
2 parents ab0954c + 26c2930 commit cebb152
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions German/helloworld.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#/usr/bin/php
<?php
echo "Hello World";
3 changes: 0 additions & 3 deletions albertmayor/helloworld

This file was deleted.

2 changes: 1 addition & 1 deletion javiLopez/helloworld.php
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?php
#:/usr/bin/php
echo "Hello World";
3 changes: 2 additions & 1 deletion oscarduran/helloworld
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/php
<?php

echo "Hello Wolrd!!!!\n";
echo "Hello World!!!!\n";


1 change: 1 addition & 0 deletions simongonzalez/helloworld
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/php
<? php

eccho "Hello World./n";

0 comments on commit cebb152

Please sign in to comment.