Resolve merge conflict

This commit is contained in:
calzoneman 2013-11-09 01:56:28 -06:00
parent 7fc50db879
commit d7a0297a8b
2 changed files with 0 additions and 9 deletions

View file

@ -648,10 +648,6 @@ var Getters = {
for (var k in fv) {
if (k === "autoplay")
fv[k] = "1";
fv[k] = fv[k].replace(/(&|%26)ip(\=|%3D)[0-9\.]+/g,
"");
fv[k] = fv[k].replace(/(&|%26)expire(\=|%3D)[0-9]+/g,
"");
fvstr += "&" + k + "=" + encodeURIComponent(fv[k]);
}
fvstr = fvstr.substring(1);