# Conflicts: # assets/scene/main.scene # settings/v2/packages/information.json |
||
|---|---|---|
| .. | ||
| BaseButton.ts | ||
| BaseButton.ts.meta | ||
| BaseSprite.ts | ||
| BaseSprite.ts.meta | ||
| BaseSpriteFrame.ts | ||
| BaseSpriteFrame.ts.meta | ||
# Conflicts: # assets/scene/main.scene # settings/v2/packages/information.json |
||
|---|---|---|
| .. | ||
| BaseButton.ts | ||
| BaseButton.ts.meta | ||
| BaseSprite.ts | ||
| BaseSprite.ts.meta | ||
| BaseSpriteFrame.ts | ||
| BaseSpriteFrame.ts.meta | ||