From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 27 Jul 2011 14:57:49 +0000 (+0200)
Subject: fix broken merge
X-Git-Tag: v3.0~267^2~364^2~21^2~28
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=556bf2ef4ddf1aa47f1ebd90494f562076fdeac2;p=nextcloud-server.git

fix broken merge
---

diff --git a/core/js/js.js b/core/js/js.js
index 3a820544b78..2f74bda2588 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -73,6 +73,8 @@ if (!Array.prototype.filter) {
 			}
 		}
 		return res;
+	}
+}
 if (!Array.prototype.indexOf){
 	Array.prototype.indexOf = function(elt /*, from*/)
 	{