summaryrefslogtreecommitdiff
path: root/src/client/app/common/scripts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-07-11 13:47:26 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-07-11 13:47:26 +0900
commit0cc00101dc1161e35f835470bb379a30e83c6d2c (patch)
treeb2a88f7be77055df696322e9538df158296cca49 /src/client/app/common/scripts
parentwip (diff)
parentRefactor (diff)
downloadsharkey-0cc00101dc1161e35f835470bb379a30e83c6d2c.tar.gz
sharkey-0cc00101dc1161e35f835470bb379a30e83c6d2c.tar.bz2
sharkey-0cc00101dc1161e35f835470bb379a30e83c6d2c.zip
Merge branch 'master' into hybrid-tl
Diffstat (limited to 'src/client/app/common/scripts')
-rw-r--r--src/client/app/common/scripts/streaming/games/reversi/reversi-game.ts (renamed from src/client/app/common/scripts/streaming/games/reversi-game.ts)4
-rw-r--r--src/client/app/common/scripts/streaming/games/reversi/reversi.ts (renamed from src/client/app/common/scripts/streaming/games/reversi.ts)6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/app/common/scripts/streaming/games/reversi-game.ts b/src/client/app/common/scripts/streaming/games/reversi/reversi-game.ts
index 2fe7dd3b07..e6b02fcfdb 100644
--- a/src/client/app/common/scripts/streaming/games/reversi-game.ts
+++ b/src/client/app/common/scripts/streaming/games/reversi/reversi-game.ts
@@ -1,5 +1,5 @@
-import Stream from '../stream';
-import MiOS from '../../../../mios';
+import Stream from '../../stream';
+import MiOS from '../../../../../mios';
export class ReversiGameStream extends Stream {
constructor(os: MiOS, me, game) {
diff --git a/src/client/app/common/scripts/streaming/games/reversi.ts b/src/client/app/common/scripts/streaming/games/reversi/reversi.ts
index 1fef93e4bf..1f4fd8c63e 100644
--- a/src/client/app/common/scripts/streaming/games/reversi.ts
+++ b/src/client/app/common/scripts/streaming/games/reversi/reversi.ts
@@ -1,6 +1,6 @@
-import StreamManager from '../stream-manager';
-import Stream from '../stream';
-import MiOS from '../../../../mios';
+import StreamManager from '../../stream-manager';
+import Stream from '../../stream';
+import MiOS from '../../../../../mios';
export class ReversiStream extends Stream {
constructor(os: MiOS, me) {