Fix tslint error

Change module-merge to use the global merge function
This commit is contained in:
hshristov
2015-08-03 13:47:45 +03:00
parent bc2f6a63c6
commit 4c03cddbd6
14 changed files with 14 additions and 37 deletions

View File

@ -3,9 +3,7 @@ import view = require("ui/core/view");
import enums = require("ui/enums");
import common = require("ui/layouts/wrap-layout/wrap-layout-common");
// merge the exports of the common file with the exports of this file
declare var exports;
require("utils/module-merge").merge(common, exports);
global.moduleMerge(common, exports);
export class WrapLayout extends common.WrapLayout {