-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/feat/game-overlay' into feat/gam…
…e-overlay # Conflicts: # apps/app/src/electron/game-overlay.ts
- Loading branch information
Showing
3 changed files
with
30 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <link href="/vite.svg" rel="icon" type="image/svg+xml" /> | ||
| <meta content="width=device-width, initial-scale=1.0" name="viewport" /> | ||
| <title>Izabela Next</title> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| <script src="/src/teams/messenger/main.ts" type="module"></script> | ||
| </body> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <link href="/vite.svg" rel="icon" type="image/svg+xml" /> | ||
| <meta content="width=device-width, initial-scale=1.0" name="viewport" /> | ||
| <title>Izabela Next</title> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| <script src="/src/teams/messenger/main.ts" type="module"></script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <link href="/vite.svg" rel="icon" type="image/svg+xml" /> | ||
| <meta content="width=device-width, initial-scale=1.0" name="viewport" /> | ||
| <title>Izabela Next</title> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| <script src="/src/teams/overlay/main.ts" type="module"></script> | ||
| </body> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <link href="/vite.svg" rel="icon" type="image/svg+xml" /> | ||
| <meta content="width=device-width, initial-scale=1.0" name="viewport" /> | ||
| <title>Izabela Next</title> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| <script src="/src/teams/overlay/main.ts" type="module"></script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <link href="/vite.svg" rel="icon" type="image/svg+xml" /> | ||
| <meta content="width=device-width, initial-scale=1.0" name="viewport" /> | ||
| <title>Izabela Next</title> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| <script src="/src/teams/speech-worker/main.ts" type="module"></script> | ||
| </body> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <link href="/vite.svg" rel="icon" type="image/svg+xml" /> | ||
| <meta content="width=device-width, initial-scale=1.0" name="viewport" /> | ||
| <title>Izabela Next</title> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| <script src="/src/teams/speech-worker/main.ts" type="module"></script> | ||
| </body> | ||
| </html> |