From be86c436cefd1ce14bfe951b90ac7d02de92f561 Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Thu, 12 May 2016 15:34:24 -0700
Subject: [PATCH] Fix material-ui

---
 material-ui/index.d.ts            | 5 ++---
 material-ui/material-ui-tests.tsx | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/material-ui/index.d.ts b/material-ui/index.d.ts
index 446da19d8d..00080d39a6 100644
--- a/material-ui/index.d.ts
+++ b/material-ui/index.d.ts
@@ -3,7 +3,8 @@
 // Definitions by: Nathan Brown <https://github.com/ngbrown>, Oliver Herrmann <https://github.com/herrmanno>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="react" />
+/// <reference types="react" />
+/// <reference types="react-addons-linked-state-mixin" />
 
 declare module "material-ui" {
     export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
@@ -95,8 +96,6 @@ declare module "material-ui" {
 }
 
 declare namespace __MaterialUI {
-    export import React = __React;
-
     // ReactLink is from "react/addons"
     interface ReactLink<T> {
         value: T;
diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
index d97fe87623..e0c13ed474 100644
--- a/material-ui/material-ui-tests.tsx
+++ b/material-ui/material-ui-tests.tsx
@@ -163,10 +163,10 @@ let muiTheme: MuiTheme = ThemeManager.getMuiTheme({
 let SelectableList = SelectableContainerEnhance(List);
 
 @ThemeDecorator(muiTheme)
-class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implements React.LinkedStateMixin {
+class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implements LinkedStateMixin {
 
     // injected with mixin
-    linkState: <T>(key: string) => React.ReactLink<T>;
+    linkState: <T>(key: string) => LinkedStateMixin.ReactLink<T>;
 
     private picker12hr: TimePicker;
     private picker24hr: TimePicker;