Merge branch 'master' of github.com:Institut-Ebre/2DAM2015_16

Institut-Ebre · Sep 28, 2015 · 97361e9 · 97361e9
2 parents 52ee1b4 + 8026e22
commit 97361e9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 16 deletions.
diff --git a/AdamAlvarado/helloword b/AdamAlvarado/helloword
diff --git a/German/helloworld.php b/German/helloworld.php
@@ -1,2 +1,3 @@
+#/usr/bin/php
 <?php
-echo "Hello World";
+echo "Hello World\n";
diff --git a/Manelhuguet/helloworld b/Manelhuguet/helloworld
diff --git a/albertmayor/helloworld b/albertmayor/helloworld
diff --git a/helloworld b/helloworld
diff --git a/max/helloworld/helloworld.php b/max/helloworld/helloworld.php
@@ -1,4 +1,9 @@
 #!/usr/bin/php
 <?php
 
-echo "Hello World!";
+$n1 = 10;
+$n2 = 3;
+
+$value = 10 + 3;
+
+echo "La suma de ".$n1." i ".$n2." és ".$value."\n";
diff --git a/oscarduran/helloworld b/oscarduran/helloworld
@@ -1,5 +1,6 @@
+#!/usr/bin/php
 <?php
 
-echo "Hello Wolrd!!!!\n";
+echo "Hello World!!!!\n";
 
 
diff --git a/simongonzalez/helloworld b/simongonzalez/helloworld
@@ -1,3 +1,4 @@
+#!/usr/bin/php
 <? php
 
 eccho "Hello World./n";