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

Institut-Ebre · Sep 28, 2015 · e68a9fe · e68a9fe
2 parents cebb152 + 33f467e
commit e68a9fe
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/AdamAlvarado/helloword b/AdamAlvarado/helloword
diff --git a/German/helloworld.php b/German/helloworld.php
@@ -1,3 +1,3 @@
 #/usr/bin/php
 <?php
-echo "Hello World";
+echo "Hello World\n";
diff --git a/helloworld → Manelhuguet/helloworld.php b/helloworld → Manelhuguet/helloworld.php
@@ -1,3 +1,3 @@
-#!/bin/php
 <?php
 echo "Hello World\n";
+
diff --git a/PauFores/.gitkeep b/PauFores/.gitkeep
diff --git a/albertmayor/helloworld.php b/albertmayor/helloworld.php
@@ -0,0 +1,5 @@
+#!/usr/bin/php
+
+<?php
+
+echo "Hello World\n";
diff --git a/javiLopez/helloworld.php b/javiLopez/helloworld.php
@@ -1,2 +1,4 @@
-#:/usr/bin/php
-echo "Hello World";
+#!/usr/bin/php
+<?php
+
+echo "Hello World\n";
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";