Resuelve el conflicto y mergea feature a master

This commit is contained in:
Hector Echiburu 2024-01-09 10:39:35 -03:00
commit c563de9167
Signed by: sirhectorin
GPG key ID: 1788D60BBD595ACB

View file

@ -6,6 +6,6 @@
<title>Document</title> <title>Document</title>
</head> </head>
<body> <body>
Cambio B Cambio ya mergeado.
</body> </body>
</html> </html>