diff options
| author | bob <bcz@cs.brown.edu> | 2019-03-11 13:45:16 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-03-11 13:45:16 -0400 |
| commit | 666c74b4bf9a4545fe6a73fcedbc73bc1fae9b94 (patch) | |
| tree | d46825e8b8a5762c21986c0c6e900b666610ad2c /src/client/views/InkingControl.tsx | |
| parent | 3c65e18a455eda378e24162ae4aaf5e37e6d107d (diff) | |
| parent | 501a74c77bda9256f449c7009194a6964819841a (diff) | |
Merge branch 'master' into hannah_linking
Diffstat (limited to 'src/client/views/InkingControl.tsx')
| -rw-r--r-- | src/client/views/InkingControl.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/InkingControl.tsx b/src/client/views/InkingControl.tsx index 929fb42a1..955831fb6 100644 --- a/src/client/views/InkingControl.tsx +++ b/src/client/views/InkingControl.tsx @@ -1,5 +1,5 @@ import { observable, action, computed } from "mobx"; -import { CirclePicker, ColorResult } from 'react-color' +import { CirclePicker, ColorResult } from 'react-color'; import React = require("react"); import "./InkingCanvas.scss" import { InkTool } from "../../fields/InkField"; |