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/search/IconButton.tsx | |
| parent | cc6040e717632ae9725c134cd8722813cb1733c2 (diff) | |
| parent | 56987012f9690d300b482d8f1b3d83935342322b (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/search/IconButton.tsx')
| -rw-r--r-- | src/client/views/search/IconButton.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/search/IconButton.tsx b/src/client/views/search/IconButton.tsx index 5d23f6eeb..d2cfe7fad 100644 --- a/src/client/views/search/IconButton.tsx +++ b/src/client/views/search/IconButton.tsx @@ -6,7 +6,7 @@ import "./IconButton.scss"; import { faSearch, faFilePdf, faFilm, faImage, faObjectGroup, faStickyNote, faMusic, faLink, faChartBar, faGlobeAsia, faBan, faVideo, faCaretDown } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { library, icon } from '@fortawesome/fontawesome-svg-core'; -import { DocumentType } from '../../documents/Documents'; +import { DocumentType } from "../../documents/DocumentTypes"; import '../globalCssVariables.scss'; import * as _ from "lodash"; import { IconBar } from './IconBar'; |