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
rogermelich committed Sep 28, 2015
2 parents 3ec5dcc + b46045f commit a25c66b
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 3 deletions.
1 change: 1 addition & 0 deletions AdamAlvarado/helloword
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#/usr/bin/php
<?php

echo "Hello Word \n";
2 changes: 2 additions & 0 deletions German/helloworld.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
echo "Hello World";
3 changes: 3 additions & 0 deletions helloworld
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/php
<?php
echo "Hello World\n";
2 changes: 2 additions & 0 deletions javiLopez/helloworld.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
echo "Hello World";
3 changes: 3 additions & 0 deletions marcdomenech/helloworld.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/php
<? php
echo "Hello World \n";
1 change: 1 addition & 0 deletions max/helloworld/helloworld.php
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/php
<?php

echo "Hello World!";
2 changes: 2 additions & 0 deletions paolodavila/helloworld
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/php

<? php

echo "Hello World";
Expand Down
2 changes: 0 additions & 2 deletions roger/helloworld

This file was deleted.

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

echo "Hello World\n";
Expand Down
3 changes: 2 additions & 1 deletion yvesnavarro/helloworld
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/php
<?php

echo "Hello World";
echo "Hello World\n";

5 changes: 5 additions & 0 deletions yvesnavarro/helloworld.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/php
<?php

echo "Hello World"."\n";

0 comments on commit a25c66b

Please sign in to comment.