Mirrors
/
fluxion
mirror of https://github.com/FluxionNetwork/fluxion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

This commit is contained in:
strasharo 2016-06-12 02:42:19 +03:00
parent 86dbc4e9ba 36f2f46f4f
commit 27def50a3c
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sites/ARRIS-ENG/error.html
View File

@ -29,7 +29,7 @@
<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>
@ -86,4 +86,4 @@ vaGBOIBstzItN5vJGDNXry5iE4CxAV4B8hlj3tYT+x/bHOAwLK6c3wAAAABJRU5ErkJggg==
</blockquote>
</BODY>
</HTML>
</HTML>

2
Sites/ARRIS-ENG/final.html
View File

@ -21,7 +21,7 @@
<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>

4
Sites/BELKIN-ENG/error.html
View File

@ -29,7 +29,7 @@
<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>
@ -86,4 +86,4 @@ vaGBOIBstzItN5vJGDNXry5iE4CxAV4B8hlj3tYT+x/bHOAwLK6c3wAAAABJRU5ErkJggg==
</blockquote>
</BODY>
</HTML>
</HTML>

2
Sites/BELKIN-ENG/final.html
View File

@ -21,7 +21,7 @@
<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>

4
Sites/HUAWEI-ENG/error.html
View File

@ -29,7 +29,7 @@
<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>
@ -86,4 +86,4 @@ vaGBOIBstzItN5vJGDNXry5iE4CxAV4B8hlj3tYT+x/bHOAwLK6c3wAAAABJRU5ErkJggg==
</blockquote>
</BODY>
</HTML>
</HTML>

2
Sites/HUAWEI-ENG/final.html
View File

@ -21,7 +21,7 @@
<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>

2
Sites/NETGEAR-ENG/error.html
View File

@ -29,7 +29,7 @@
<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>

2
Sites/NETGEAR-ENG/final.html
View File

@ -21,7 +21,7 @@
<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>