Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add hypertext component #210

Merged
merged 27 commits into from
Apr 13, 2018
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge issue resolved
  • Loading branch information
marjonlynch committed Apr 13, 2018
commit 451c9ad2d4cf3ad3a96026d30918a2aeba39ab2c
3 changes: 3 additions & 0 deletions packages/fast-components-react-msft/src/index.ts
Original file line number Diff line number Diff line change
@@ -3,12 +3,15 @@ export { Button };

import Divider from "./divider";
export { Divider };
<<<<<<< HEAD

import Image from "./image";
export {Image};

import Toggle from "./toggle";
export { Toggle };
=======
>>>>>>> merge issue resolved

import Hypertext from "./hypertext";
export { Hypertext };