From 556bf2ef4ddf1aa47f1ebd90494f562076fdeac2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 27 Jul 2011 16:57:49 +0200
Subject: [PATCH] fix broken merge

---
 core/js/js.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/js/js.js b/core/js/js.js
index 3a820544b7..2f74bda258 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*/)
 	{