fix merge issue

This commit is contained in:
Vladimir Matveev committed 2015-11-09 10:46:50 -08:00
1 parent 810c45b5fb
commit a531610eb9
1 file changed
+1 -1
+1 -1
View File
@@ -580,7 +580,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
externalImports = undefined;
exportSpecifiers = undefined;
exportEquals = undefined;
hasExportStars = undefined;
hasExportStarsToExportValues = undefined;
detachedCommentsInfo = undefined;
sourceMapData = undefined;
isEs6Module = false;