odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Remove conflicts. 

bzr revid: sma@tinyerp.com-20110812103818-q8wet6opinckiv1a
This commit is contained in:
sma (Tiny) 2011-08-12 16:08:18 +05:30
parent 5a1b47417c
commit 2c2fe7a691
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base/static/src/js/chrome.js
View File

@ -4,7 +4,7 @@
openerp.base.chrome = function(openerp) {
<<<<<<< TREE
openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Session# */{
/**
* @constructs
@ -273,8 +273,6 @@ openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Sessi
}
});
=======
>>>>>>> MERGE-SOURCE
openerp.base.Notification = openerp.base.Widget.extend({
init: function(parent, element_id) {
this._super(parent, element_id);