resolved conflicts to pullrequest #442

This commit is contained in:
Diullei Gomes
2013-04-03 08:53:04 -03:00
parent ffb2099a09
commit 6fb8560a58
2 changed files with 19 additions and 3 deletions
+3 -1
View File
@@ -203,4 +203,6 @@ interface RequireDefine {
// Ambient declarations for 'require' and 'define'
declare var require: Require;
declare var define: RequireDefine;
declare var requirejs: Require;
declare var req: Require;
declare var define: RequireDefine;