chore(): resolve merge conflicts

This commit is contained in:
Liam DeBeasi
2021-06-21 14:03:47 -04:00
32 changed files with 278 additions and 151 deletions

View File

@ -209,7 +209,7 @@ export class Platform {
}
/**
* Returns `true` if the app is in portait mode.
* Returns `true` if the app is in portrait mode.
*/
isPortrait(): boolean {
return this.win.matchMedia && this.win.matchMedia('(orientation: portrait)').matches;