From 4142c2788faddaf43518fc3820e03e209d4ccd63 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 25 Sep 2019 11:29:30 -0700
Subject: [PATCH] Update test failure from merge conflict.

A test written on 12 Sep was merged on 24 Sep. In between, the Props
definition it used changed so that the new test was an error.

This PR just clones the original Props type and gives it a new name.
---
 types/react/test/index.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 7ab3cc4d33..6a44ae5682 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -402,7 +402,13 @@ const ForwardingRefComponent = React.forwardRef((props: {}, ref: React.Ref<RefCo
     return React.createElement(RefComponent, { ref });
 });
 
-const ForwardingRefComponentPropTypes: React.WeakValidationMap<Props> = {};
+interface AttributeProps extends React.Attributes {
+    hello: string;
+    world?: string | null;
+    foo: number;
+}
+
+const ForwardingRefComponentPropTypes: React.WeakValidationMap<AttributeProps> = {};
 ForwardingRefComponent.propTypes = ForwardingRefComponentPropTypes;
 
 function RefCarryingComponent() {