diff options
| author | kimdahey <claire_kim1@brown.edu> | 2019-08-23 13:52:41 -0400 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2019-08-23 13:52:41 -0400 |
| commit | 72ed0bbdb045695a8dcb7d604a9d834b16f424a9 (patch) | |
| tree | f6a062b47f255b9f211c4f2b9218bcf2dca15eb2 /src/client/views/collections/collectionFreeForm/CollectionFreeFormRemoteCursors.tsx | |
| parent | cc6040e717632ae9725c134cd8722813cb1733c2 (diff) | |
| parent | 56987012f9690d300b482d8f1b3d83935342322b (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/collections/collectionFreeForm/CollectionFreeFormRemoteCursors.tsx')
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/CollectionFreeFormRemoteCursors.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormRemoteCursors.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormRemoteCursors.tsx index 3193f5624..b8148852d 100644 --- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormRemoteCursors.tsx +++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormRemoteCursors.tsx @@ -55,7 +55,7 @@ export class CollectionFreeFormRemoteCursors extends React.Component<CollectionV ctx.stroke(); // ctx.font = "10px Arial"; - // ctx.fillText(CurrentUserUtils.email[0].toUpperCase(), 10, 10); + // ctx.fillText(Doc.CurrentUserEmail[0].toUpperCase(), 10, 10); } } } |