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

Institut-Ebre · Sep 28, 2015 · e0ed6ef · e0ed6ef
2 parents 4f36fad + e68a9fe
commit e0ed6ef
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 5 deletions.
diff --git a/DanielDolz/helloworld.php b/DanielDolz/helloworld.php
diff --git a/German/helloworld.php b/German/helloworld.php
@@ -0,0 +1,3 @@
+#/usr/bin/php
+<?php
+echo "Hello World\n";
diff --git a/Manelhuguet/helloworld.php b/Manelhuguet/helloworld.php
@@ -0,0 +1,3 @@
+<?php
+echo "Hello World\n";
+
diff --git a/helloworld → PauFores/helloworld b/helloworld → PauFores/helloworld
@@ -2,4 +2,3 @@
 
 echo "Hello World";
 
-
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
@@ -0,0 +1,4 @@
+#!/usr/bin/php
+<?php
+
+echo "Hello World\n";
diff --git a/marcdomenech/helloworld → marcdomenech/helloworld.php b/marcdomenech/helloworld → marcdomenech/helloworld.php
@@ -1,2 +1,3 @@
+#!/usr/bin/php
 <? php
 echo "Hello World \n";
diff --git a/max/helloworld/helloworld.php b/max/helloworld/helloworld.php
@@ -0,0 +1,9 @@
+#!/usr/bin/php
+<?php
+
+$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
@@ -0,0 +1,6 @@
+#!/usr/bin/php
+<?php
+
+echo "Hello World!!!!\n";
+
+
diff --git a/paolodavila/helloworld b/paolodavila/helloworld
@@ -1,3 +1,6 @@
+#!/usr/bin/php
+
 <? php
 
-echo "Hello World";
+echo "Hello World";
+
diff --git a/roger/helloworld b/roger/helloworld
diff --git a/roger/helloworld.php b/roger/helloworld.php
@@ -0,0 +1,3 @@
+#! /usr/bin/php
+<?php
+echo "hello world \n";
diff --git a/sergitur/helloworld b/sergitur/helloworld
@@ -1,3 +1,4 @@
+#!/usr/bin/php
 <?php
 
 echo "Hello World\n";

diff --git a/simongonzalez/helloworld b/simongonzalez/helloworld
@@ -0,0 +1,4 @@
+#!/usr/bin/php
+<? php
+
+eccho "Hello World./n";
diff --git a/yvesnavarro/helloworld b/yvesnavarro/helloworld
@@ -0,0 +1,5 @@
+#!/usr/bin/php
+<?php
+
+echo "Hello World\n";
+
diff --git a/yvesnavarro/helloworld.php b/yvesnavarro/helloworld.php
@@ -0,0 +1,5 @@
+#!/usr/bin/php
+<?php
+
+echo "Hello World"."\n";
+