Merge branch 'master' of bitbucket.org:xgiovio/unisa_tsw_2014_2015

2014-10-10 10:48:58 +02:00
parent 24da5c4871 da027c9566
commit e9628eafd7
1 changed files with 38 additions and 0 deletions
--- a/table_test.html
+++ b/table_test.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Test</title>
+	<meta name="author" content="xgiovio"/>
+	<meta name="description" content="A simple test page"/>
+	<meta name="keywords" content="Ormai google non se le fila piu"/>
+	<meta name ="robots" content="index"/>
+	<meta charset="utf-8"/>
+	<!--  <link rel="stylesheet" href="style.css"  type="text/css" />     !-->
+
+</head>
+<body>
+
+<table border="1">
+	
+	<tr>
+<td rowspan="2"> Anna</td>
+<td style="background-color:#000000">Giulia</td>
+<td colspan="2">Carla</td>
+
+
+
+	</tr>
+	<tr>
+<th>Marco</th>
+<td>Antonio</td>
+<td>Marcello</td>
+
+	</tr>
+
+
+</table>
+
+
+
+</body>
+</html>