diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-07-27 16:57:49 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-07-27 16:57:49 +0200 |
| commit | 556bf2ef4ddf1aa47f1ebd90494f562076fdeac2 (patch) | |
| tree | ba8739acde3187ac3ba78f728627daad342b9572 | |
| parent | 0dad1f8ccb01f5c60ef919bdc347d8a22cb728f8 (diff) | |
| download | nextcloud-server-556bf2ef4ddf1aa47f1ebd90494f562076fdeac2.tar.gz nextcloud-server-556bf2ef4ddf1aa47f1ebd90494f562076fdeac2.zip | |
fix broken merge
| -rw-r--r-- | core/js/js.js | 2 |
1 files changed, 2 insertions, 0 deletions
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*/) { |