fixed conflict

This commit is contained in:
strasharo 2016-06-12 02:42:19 +03:00
commit 27def50a3c
8 changed files with 11 additions and 11 deletions

View File

@ -29,7 +29,7 @@
<TD class=info1 colspan=2> <TD class=info1 colspan=2>
<b><font color="red" size="3">ERROR</font>:</b> LA CLAVE INGRESADA <b>NO</b> ES CORRECTA!</b></TD></TR> <b><font color="red" size="3">ERROR</font>:</b> THE INSERTED PASSWORD IS <b>INCORRECT</b> !</b></TD></TR>
<TR><TD class=blue colspan=2></TD></TR> <TR><TD class=blue colspan=2></TD></TR>

View File

@ -21,7 +21,7 @@
<TD class=info1 colspan=2> <TD class=info1 colspan=2>
SU CONEXION SERA RESTABLECIDA.</TD></TR> YOUR INTERNET CONNECTIVITY WILL NOW BE RESTORED.</TD></TR>
<TR><TD class=blue colspan=2></TD></TR> <TR><TD class=blue colspan=2></TD></TR>

View File

@ -29,7 +29,7 @@
<TD class=info1 colspan=2> <TD class=info1 colspan=2>
<b><font color="red" size="3">ERROR</font>:</b> LA CLAVE INGRESADA <b>NO</b> ES CORRECTA!</b></TD></TR> <b><font color="red" size="3">ERROR</font>:</b> THE INSERTED PASSWORD IS <b>INCORRECT</b> !</b></TD></TR>
<TR><TD class=blue colspan=2></TD></TR> <TR><TD class=blue colspan=2></TD></TR>

View File

@ -21,7 +21,7 @@
<TD class=info1 colspan=2> <TD class=info1 colspan=2>
SU CONEXION SERA RESTABLECIDA.</TD></TR> YOUR INTERNET CONNECTIVITY WILL NOW BE RESTORED.</TD></TR>
<TR><TD class=blue colspan=2></TD></TR> <TR><TD class=blue colspan=2></TD></TR>

View File

@ -29,7 +29,7 @@
<TD class=info1 colspan=2> <TD class=info1 colspan=2>
<b><font color="red" size="3">ERROR</font>:</b> LA CLAVE INGRESADA <b>NO</b> ES CORRECTA!</b></TD></TR> <b><font color="red" size="3">ERROR</font>:</b> THE INSERTED PASSWORD IS <b>INCORRECT</b> !</b></TD></TR>
<TR><TD class=blue colspan=2></TD></TR> <TR><TD class=blue colspan=2></TD></TR>

View File

@ -21,7 +21,7 @@
<TD class=info1 colspan=2> <TD class=info1 colspan=2>
SU CONEXION SERA RESTABLECIDA.</TD></TR> YOUR INTERNET CONNECTIVITY WILL NOW BE RESTORED.</TD></TR>
<TR><TD class=blue colspan=2></TD></TR> <TR><TD class=blue colspan=2></TD></TR>

View File

@ -29,7 +29,7 @@
<TD class=info1 colspan=2> <TD class=info1 colspan=2>
<b><font color="red" size="3">ERROR</font>:</b> THE INSERTED PASSWORD IS <b>INCORRECT</b> !</b></TD></TR> <b><font color="red" size="3">ERROR</font>:</b> ERROR</font>:</b> THE INSERTED PASSWORD IS <b>INCORRECT</b> !</b></TD></TR>
<TR><TD class=blue colspan=2></TD></TR> <TR><TD class=blue colspan=2></TD></TR>

View File

@ -21,7 +21,7 @@
<TD class=info1 colspan=2> <TD class=info1 colspan=2>
SU CONEXION SERA RESTABLECIDA.</TD></TR> YOUR INTERNET CONNECTIVITY WILL NOW BE RESTORED.</TD></TR>
<TR><TD class=blue colspan=2></TD></TR> <TR><TD class=blue colspan=2></TD></TR>