Skip to content

Commit

Permalink
Fix merged code (#264)
Browse files Browse the repository at this point in the history
I non-conflicting merge between two branches caused
a duplicate identifier error. This commit de-dupes
the identifier.
  • Loading branch information
themadcreator authored and giladgray committed Nov 29, 2016
1 parent 0289208 commit fe5576e
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions packages/table/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export {
} from "./common/index";

export {
IClientCoordinates,
ICoordinateData,
IDragHandler,
IDraggableProps,
Expand All @@ -51,14 +52,9 @@ export {
export {
CopyCellsMenuItem,
IContextMenuRenderer,
IMenuContext
IMenuContext,
} from "./interactions/menus";

export {
IClientCoordinates,
ICoordinateData,
} from "./interactions/draggable";

export {
ILockableLayout,
IResizeHandleProps,
Expand Down

1 comment on commit fe5576e

@blueprint-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix merged code (#264)

Preview: docs Coverage: core | datetime

Please sign in to comment.