diff options
| author | eleanor-park <eleanor_park@brown.edu> | 2025-01-08 11:15:25 -0500 |
|---|---|---|
| committer | eleanor-park <eleanor_park@brown.edu> | 2025-01-08 11:15:25 -0500 |
| commit | 8283499ca247da4f283f220d368e5e178c4d79a1 (patch) | |
| tree | fbf39aa81c7d8e82dd9844d6e14392e6ad78e22d /src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx | |
| parent | 45e22be891331e2d6a381e988c7abd29af3e1399 (diff) | |
| parent | 2f7d1f0073943e1eb9e0f34c4459bc0176377697 (diff) | |
Merge branch 'eleanor-gptdraw' of https://github.com/brown-dash/Dash-Web into eleanor-gptdraw
Diffstat (limited to 'src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx')
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx index af82724ef..63e5e33ca 100644 --- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx +++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx @@ -1,5 +1,9 @@ import { Bezier } from 'bezier-js'; +<<<<<<< HEAD import { Button, Colors, Type } from 'browndash-components'; +======= +import { Colors } from '@dash/components'; +>>>>>>> 2f7d1f0073943e1eb9e0f34c4459bc0176377697 import { Property } from 'csstype'; import { action, computed, IReactionDisposer, makeObservable, observable, reaction, runInAction } from 'mobx'; import { observer } from 'mobx-react'; |