tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Update generated files

Browse Source
This commit is contained in:
pengfei.zhou
2021-12-30 10:50:08 +08:00
committed by osborn
parent e9e2d14a9d
commit cac47ee0b4
6 changed files with 6 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doric-js/bundle/doric-lib.es5.js
View File

@@ -2243,10 +2243,7 @@ var BundleResource = /** @class */ (function (_super) {
return _super.call(this, "bundle", bundleName + "://" + fileName) || this;
}
return BundleResource;
<<<<<<< HEAD
}(iOSResource));
=======
}(Resource));
var ArrayBufferResource = /** @class */ (function (_super) {
__extends$f(ArrayBufferResource, _super);
function ArrayBufferResource(data) {
@@ -2264,7 +2261,6 @@ var ArrayBufferResource = /** @class */ (function (_super) {
};
return ArrayBufferResource;
}(Resource));
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
var __extends$e = (undefined && undefined.__extends) || (function () {
var extendStatics = function (d, b) {
@@ -4646,12 +4642,8 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet;
<<<<<<< HEAD
exports.AssetsResource = AssetsResource;
=======
exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetResource = AssetResource;
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
exports.AssetsResource = AssetsResource;
exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation;
exports.Base64Resource = Base64Resource;

6
doric-js/bundle/doric-lib.js
View File

@@ -3540,12 +3540,8 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet;
<<<<<<< HEAD
exports.AssetsResource = AssetsResource;
=======
exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetResource = AssetResource;
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
exports.AssetsResource = AssetsResource;
exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation;
exports.Base64Resource = Base64Resource;

6
doric-js/bundle/doric-vm.js
View File

@@ -5309,12 +5309,8 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet;
<<<<<<< HEAD
exports.AssetsResource = AssetsResource;
=======
exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetResource = AssetResource;
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
exports.AssetsResource = AssetsResource;
exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation;
exports.Base64Resource = Base64Resource;