Resuelve el conflicto y mergea feature a master
This commit is contained in:
commit
c563de9167
1 changed files with 1 additions and 1 deletions
|
@ -6,6 +6,6 @@
|
||||||
<title>Document</title>
|
<title>Document</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
Cambio B
|
Cambio ya mergeado.
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
Loading…
Add table
Reference in a new issue