diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2014-03-06 11:55:45 +0100 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-03-06 11:55:45 +0100 |
| commit | eb5265b1065c4978028c34ee7b77aff137c51c9f (patch) | |
| tree | 8448dbbf0eecb87746cfc23ee8ecd1389295fa89 /core/js/share.js | |
| parent | dbf83aada2f8dae509d17b947ecce6a4d09f8174 (diff) | |
| parent | 1785c0c9b9fcdc6e9a8e58f13f45e5b53364882a (diff) | |
| download | nextcloud-server-eb5265b1065c4978028c34ee7b77aff137c51c9f.tar.gz nextcloud-server-eb5265b1065c4978028c34ee7b77aff137c51c9f.zip | |
fix merge conflicts
Diffstat (limited to 'core/js/share.js')
| -rw-r--r-- | core/js/share.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/share.js b/core/js/share.js index 0939259b7da..129e50b22d5 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -584,8 +584,8 @@ $(document).ready(function() { $(checkboxes).filter('input[name="edit"]').attr('checked', false); // Check Edit if Create, Update, or Delete is checked } else if (($(this).attr('name') == 'create' - || $(this).attr('name') == 'update' - || $(this).attr('name') == 'delete')) + || $(this).attr('name') == 'update' + || $(this).attr('name') == 'delete')) { $(checkboxes).filter('input[name="edit"]').attr('checked', true); } |