Skip to content

Commit 98f144e

Browse files
author
ggomezo
committed
MERGE1: Merge de las correcciones
2 parents 85a202a + a97b2da commit 98f144e

File tree

5 files changed

+108
-106
lines changed

5 files changed

+108
-106
lines changed

Diff for: ‎html/pagina1.html

+21-23
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
2-
<HTML>
3-
<HEAD>
4-
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
5-
<TITLE>Mi primera página</TITLE>
6-
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
7-
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
8-
<META NAME="CREATED" CONTENT="20020903;6090096">
9-
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
10-
<META NAME="CHANGED" CONTENT="20020903;6133657">
1+
<!DOCTYPE html><html><head>
2+
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
3+
<title>Mi primera página</title>
4+
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
5+
<meta name="AUTHOR" content="Gloria Cortés">
6+
<meta name="CREATED" content="20020903;6090096">
7+
<meta name="CHANGEDBY" content="Gloria Cortés">
8+
<meta name="CHANGED" content="20020903;6133657">
119

1210
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
13-
</HEAD>
14-
<BODY LANG="es-ES" class="container text-center">
15-
<H1>
16-
<IMG ID="imagen1" SRC="../imagenes/BD1.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
17-
</H1>
18-
<H1 ID="titulo1">Mi primera página HTML</H1>
19-
<P>
20-
<BR><BR>
21-
</P>
11+
</head>
12+
<body lang="es-ES" class="container text-center">
13+
<h1>
14+
<img id="imagen1" src="../imagenes/BD1.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
15+
</h1>
16+
<h1 id="titulo1">Mi primera página HTML</h1>
17+
<p>
18+
<br><br>
19+
</p>
2220
<div class="row text-center">
2321
<div class="col-md-6">
24-
<span>&larr;</span><A HREF="pagina5.html">Mi quinta página HTML</A>
22+
<span>←</span><a href="pagina5.html">Mi quinta página HTML</a>
2523
</div>
2624
<div class="col-md-6">
27-
<A ID="enlace1" HREF="pagina1.html">Mi primera página HTML</A><span>&rarr;</span>
25+
<a id="enlace1" href="pagina2.html">Mi segunda página HTML</a><span>→</span>
2826
</div>
2927
</div>
30-
</BODY>
31-
</HTML>
28+
29+
</body></html>

Diff for: ‎html/pagina2.html

+21-23
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
2-
<HTML>
3-
<HEAD>
4-
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
5-
<TITLE>Mi primera página</TITLE>
6-
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
7-
<META NAME="AUTHOR" CONTENT="Gloria Cortés">
8-
<META NAME="CREATED" CONTENT="20020903;6090096">
9-
<META NAME="CHANGEDBY" CONTENT="Gloria Cortés">
10-
<META NAME="CHANGED" CONTENT="20020903;6133657">
1+
<!DOCTYPE html><html><head>
2+
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
3+
<title>Mi primera página</title>
4+
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
5+
<meta name="AUTHOR" content="Gloria Cortés">
6+
<meta name="CREATED" content="20020903;6090096">
7+
<meta name="CHANGEDBY" content="Gloria Cortés">
8+
<meta name="CHANGED" content="20020903;6133657">
119
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
12-
</HEAD>
13-
<BODY LANG="es-ES" class="container text-center">
14-
<H1>
15-
<IMG ID="imagen2" SRC="../imagenes/BD2.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
16-
</H1>
17-
<H1 ID="titulo2">Mi primera página HTML</H1>
18-
<P>
19-
<BR><BR>
20-
</P>
10+
</head>
11+
<body lang="es-ES" class="container text-center">
12+
<h1>
13+
<img id="imagen2" src="../imagenes/BD2.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
14+
</h1>
15+
<h1 id="titulo2">Mi segunda página HTML</h1>
16+
<p>
17+
<br><br>
18+
</p>
2119
<div class="row text-center">
2220
<div class="col-md-6">
23-
<span>←</span><A HREF="pagina1.html">Mi primera página HTML</A>
21+
<span>←</span><a href="pagina1.html">Mi primera página HTML</a>
2422
</div>
2523
<div class="col-md-6">
26-
<A ID="enlace2" HREF="pagina3.html">Mi tercera página HTML</A><span>&rarr;</span>
24+
<a id="enlace2" href="pagina3.html">Mi tercera página HTML</a><span>→</span>
2725
</div>
2826
</div>
29-
</BODY>
30-
</HTML>
27+
28+
</body></html>

Diff for: ‎html/pagina3.html

+20-22
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
2-
<HTML>
3-
<HEAD>
4-
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
5-
<TITLE>Mi primera página</TITLE>
6-
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
7-
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
8-
<META NAME="CREATED" CONTENT="20020903;6090096">
9-
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
10-
<META NAME="CHANGED" CONTENT="20020903;6133657">
1+
<!DOCTYPE html><html><head>
2+
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
3+
<title>Mi primera página</title>
4+
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
5+
<meta name="AUTHOR" content="Gloria Cortés">
6+
<meta name="CREATED" content="20020903;6090096">
7+
<meta name="CHANGEDBY" content="Gloria Cortés">
8+
<meta name="CHANGED" content="20020903;6133657">
119
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
12-
</HEAD>
13-
<BODY LANG="es-ES" class="container text-center">
14-
<H1>
15-
<IMG ID="imagen3" SRC="../imagenes/BD1.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
16-
</H1>
17-
<H1 ID="titulo3">Mi primera página HTML</H1>
18-
<P>
19-
<BR><BR>
20-
</P>
10+
</head>
11+
<body lang="es-ES" class="container text-center">
12+
<h1>
13+
<img id="imagen3" src="../imagenes/BD3.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
14+
</h1>
15+
<h1 id="titulo3">Mi tercera página HTML</h1>
16+
<p>
17+
<br><br>
18+
</p>
2119
<div class="row text-center">
2220
<div class="col-md-6">
23-
<span>&larr;</span><A HREF="pagina2.html">Mi segunda página HTML</A>
21+
<span>←</span><a href="pagina2.html">Mi segunda página HTML</a>
2422
</div>
2523
<div class="col-md-6">
2624
<A ID="enlace3" HREF="pagina4.html">Mi cuarta página HTML</A><span>&rarr;</span>
2725
</div>
2826
</div>
29-
</BODY>
30-
</HTML>
27+
28+
</body></html>

Diff for: ‎html/pagina4.html

+21-23
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
2-
<HTML>
3-
<HEAD>
4-
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
5-
<TITLE>Mi primera página</TITLE>
6-
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
7-
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
8-
<META NAME="CREATED" CONTENT="20020903;6090096">
9-
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
10-
<META NAME="CHANGED" CONTENT="20020903;6133657">
1+
<!DOCTYPE html><html><head>
2+
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
3+
<title>Mi primera página</title>
4+
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
5+
<meta name="AUTHOR" content="Gloria Cortés">
6+
<meta name="CREATED" content="20020903;6090096">
7+
<meta name="CHANGEDBY" content="Gloria Cortés">
8+
<meta name="CHANGED" content="20020903;6133657">
119
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
12-
</HEAD>
13-
<BODY LANG="es-ES" class="container text-center">
14-
<H1>
15-
<IMG ID="imagen4" SRC="../imagenes/BD1.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
16-
</H1>
17-
<H1 ID="titulo4">Mi primera página HTML</H1>
18-
<P>
19-
<BR><BR>
20-
</P>
10+
</head>
11+
<body lang="es-ES" class="container text-center">
12+
<h1>
13+
<img id="imagen4" src="../imagenes/BD4.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
14+
</h1>
15+
<h1 id="titulo4">Mi cuarta página HTML</h1>
16+
<p>
17+
<br><br>
18+
</p>
2119
<div class="row text-center">
2220
<div class="col-md-6">
23-
<span>&larr;</span><A HREF="pagina3.html">Mi tercera página HTML</A>
21+
<span>←</span><a href="pagina3.html">Mi tercera página HTML</a>
2422
</div>
2523
<div class="col-md-6">
26-
<A ID="enlace4" HREF="pagina2.html">Mi segunda página HTML</A><span>&rarr;</span>
24+
<a id="enlace4" href="pagina5.html">Mi quinta página HTML</a><span>→</span>
2725
</div>
2826
</div>
29-
</BODY>
30-
</HTML>
27+
28+
</body></html>

Diff for: ‎html/pagina5.html

+25-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
2-
<HTML>
3-
<HEAD>
4-
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
5-
<TITLE>Mi primera página</TITLE>
6-
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
7-
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
8-
<META NAME="CREATED" CONTENT="20020903;6090096">
9-
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
10-
<META NAME="CHANGED" CONTENT="20020903;6133657">
1+
<!DOCTYPE html><html><head>
2+
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
3+
<title>Mi primera página</title>
4+
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
5+
<meta name="AUTHOR" content="Gloria Cortés">
6+
<meta name="CREATED" content="20020903;6090096">
7+
<meta name="CHANGEDBY" content="Gloria Cortés">
8+
<meta name="CHANGED" content="20020903;6133657">
119
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
10+
<<<<<<< HEAD
1211
</HEAD>
1312
<BODY LANG="es-ES" class="container text-center">
1413
<H1>
@@ -18,14 +17,25 @@ <H1 ID="titulo5">Mi quinta página HTML</H1>
1817
<P>
1918
<BR><BR>
2019
</P>
20+
=======
21+
</head>
22+
<body lang="es-ES" class="container text-center">
23+
<h1>
24+
<img id="imagen5" src="../imagenes/BD5.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
25+
</h1>
26+
<h1 id="titulo5">Mi quinta página HTML</h1>
27+
<p>
28+
<br><br>
29+
</p>
30+
>>>>>>> a97b2dab3aa4e5029d4c7de6969adbea3b52e17f
2131
<div class="row text-center">
2232
<div class="col-md-6">
23-
<span>&larr;</span><A HREF="pagina4.html">Mi cuarta página HTML</A>
33+
<span>←</span><a href="pagina4.html">Mi cuarta página HTML</a>
2434
</div>
2535
<div class="col-md-6">
26-
<A ID="enlace5" HREF="pagina2.html">Mi segunda página HTML</A><span>&rarr;</span>
36+
<a id="enlace5" href="pagina1.html">Mi primera página HTML</a><span>→</span>
2737
</div>
2838
</div>
29-
<P></P>
30-
</BODY>
31-
</HTML>
39+
<p></p>
40+
41+
</body></html>

0 commit comments

Comments
 (0)