diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-02-02 17:04:56 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-02-02 17:04:56 +0530 |
| commit | a9aaad2257ae9b61729757007ef59db41f8521f4 (patch) | |
| tree | b4f8eb082b9161b0d43ac52663a63a039c7da112 /addons/web/static/src/js/view_editor.js | |
| parent | 8a5593dcc68df71c5f33a3624936efbddbe8ec34 (diff) | |
[RES] Resolve conflict from view-editor.js.
bzr revid: jra@tinyerp.com-20120202113456-wqpffa9mdpinmbby
Diffstat (limited to 'addons/web/static/src/js/view_editor.js')
| -rw-r--r-- | addons/web/static/src/js/view_editor.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 97304bbb679..7fd88749193 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -848,11 +848,7 @@ openerp.web.ViewEditor = openerp.web.OldWidget.extend({ res_groups.read_slice([], {}).done(function (res_grp) { _.each(res_grp, function (res) { var key = res.id; -<<<<<<< TREE group_names[key]=res.full_name; -======= - group_names[key] = res.name; ->>>>>>> MERGE-SOURCE group_ids.push(res.id); }); model_data.read_slice([], {domain: [ |