diff options
| author | Hannah Chow <hannah_chow@brown.edu> | 2019-03-11 17:11:43 -0400 |
|---|---|---|
| committer | Hannah Chow <hannah_chow@brown.edu> | 2019-03-11 17:11:43 -0400 |
| commit | 281b4e05a7fbd6b038782d9708839bf7edcf398d (patch) | |
| tree | d91d9d4b45571b35c6b84d31de8af0487c4aaa2e /src/client/views/InkingControl.tsx | |
| parent | fe4f37c9986e0a6500d63b46e2238b0e0efb102b (diff) | |
| parent | 618e66a5a070f1aac9224bd3f44b76a5ac314bfa (diff) | |
uhhhh
Diffstat (limited to 'src/client/views/InkingControl.tsx')
| -rw-r--r-- | src/client/views/InkingControl.tsx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/client/views/InkingControl.tsx b/src/client/views/InkingControl.tsx index 523971af4..96bf4d091 100644 --- a/src/client/views/InkingControl.tsx +++ b/src/client/views/InkingControl.tsx @@ -1,5 +1,11 @@ import { observable, action, computed } from "mobx"; +<<<<<<< HEAD import { CirclePicker, ColorResult } from 'react-color' +======= +import { CirclePicker, ColorResult } from 'react-color'; +import React = require("react"); +import "./InkingCanvas.scss" +>>>>>>> 618e66a5a070f1aac9224bd3f44b76a5ac314bfa import { InkTool } from "../../fields/InkField"; import { observer } from "mobx-react"; import React = require("react"); |