Resolve conflicts

This commit is contained in:
Karol Janyst
2017-01-30 12:29:08 +09:00
649 changed files with 16694 additions and 2482 deletions
+1
View File
@@ -2,6 +2,7 @@
// Project: https://github.com/react-bootstrap/react-router-bootstrap
// Definitions by: Vincent Lesierse <https://github.com/vlesierse>, Karol Janyst <https://github.com/LKay>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.1
export { default as LinkContainer } from "react-router-bootstrap/lib/LinkContainer"
export { default as IndexLinkContainer } from "react-router-bootstrap/lib/IndexLinkContainer"